1. Updates to build with Spack

2. Added at unit-tested string_printf() function
3. Improved .gitignore

Author: Elizabeth F

Diff for: .gitignore

@@ -31,3 +31,5 @@ build
 *~
 *.bak
 easybuild/
+todel
+.#*

Diff for: CMakeLists.txt

@@ -37,7 +37,7 @@ if (NOT DEFINED USE_BLITZ)
 	set(USE_BLITZ YES)
 endif()
 if (USE_BLITZ)
-	find_package(blitz REQUIRED)
+	find_package(Blitz REQUIRED)
 	add_definitions(-DUSE_BLITZ)
 	include_directories(${BLITZ_INCLUDE_DIR})
 	list(APPEND EXTERNAL_LIBS ${BLITZ_LIBRARY})
@@ -61,7 +61,7 @@ if (NOT DEFINED USE_BOOST)
 	set(USE_BOOST YES)
 endif()
 if (USE_BOOST)
-	find_package(boost COMPONENTS operators optional iterator preprocessor)
+	find_package(Boost COMPONENTS operators optional iterator preprocessor)
 	add_definitions(-DUSE_BOOST)
 	include_directories(${BOOST_INCLUDE_DIRS})
 	list(APPEND EXTERNAL_LIBS ${BOOST_LIBRARIES})
@@ -93,14 +93,14 @@ include (setup_rpath)
 
 # Include all the transitive dependencies determined by EasyBuild.
 # If we're not running with EasyBuild, this does nothing...
-include_directories($ENV{EB_INCLUDE_PATH})
+include_directories($ENV{CMAKE_TRANSITIVE_INCLUDE_PATH})
 
 
 # -------- Process subdirectories of the build
 add_subdirectory(slib)
 #add_subdirectory(bin)
 if (USE_GTEST)
-	find_package(gtest REQUIRED)
+	find_package(Gtest REQUIRED)
 	add_subdirectory(tests)
 endif()
 

Diff for: cmake/FindGtest.cmake

@@ -8,9 +8,11 @@
 FIND_PATH(GTEST_INCLUDE_DIR gtest
 	HINTS ${GTEST_ROOT}/include)
 
-FIND_LIBRARY(GTEST_LIBRARY NAMES gtest
+FIND_LIBRARY(GTEST_LIBRARY_MAIN NAMES gtest
 	HINTS ${GTEST_ROOT}/lib)
 
+list(APPEND GTEST_LIBRARY ${GTEST_LIBRARY_MAIN} -lpthread -lm)
+
 IF (GTEST_INCLUDE_DIR AND GTEST_LIBRARY)
    SET(GTEST_FOUND TRUE)
 ENDIF (GTEST_INCLUDE_DIR AND GTEST_LIBRARY)

Diff for: cmake/FindNetCDF4_CXX.cmake

@@ -9,7 +9,8 @@ FIND_PATH(NETCDF4_CXX_INCLUDE_DIR netcdf
 	HINTS ${NETCDF4_CXX_ROOT}/include)
 
 FIND_LIBRARY(NETCDF4_CXX_LIBRARY NAMES netcdf-cxx4
-	HINTS ${NETCDF4_CXX_ROOT}/lib)
+	HINTS ${NETCDF4_CXX_ROOT}/lib ${NETCDF4_CXX_ROOT}/lib64)
+
 
 IF (NETCDF4_CXX_INCLUDE_DIR AND NETCDF4_CXX_LIBRARY)
    SET(NETCDF4_CXX_FOUND TRUE)

Diff for: cmake/FindPython.cmake

@@ -11,18 +11,21 @@
 #endif()
 
 message(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
-find_program(PYTHON_EXECUTABLE python DOC "python interpreter")
+find_program(PYTHON_EXECUTABLE python3 DOC "python interpreter")
+#find_program(PYTHON_CONFIG_EXE python3-config DOC "python configuration")
+
 
 if(PYTHON_EXECUTABLE)
     execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print (sysconfig.get_path('include'))"
                      OUTPUT_VARIABLE PYTHON_INCLUDES
                      RESULT_VARIABLE PYTHON_INCLUDES_NOT_FOUND
                      OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-    execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print (sysconfig.get_config_var('LIBPL'))"
-                     OUTPUT_VARIABLE PYTHON_LIBDIR
-                     RESULT_VARIABLE PYTHON_LIBDIR_NOT_FOUND
-                     OUTPUT_STRIP_TRAILING_WHITESPACE)
+#    execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print (sysconfig.get_config_var('LIBPL'))"
+#                     OUTPUT_VARIABLE PYTHON_LIBDIR
+#                     RESULT_VARIABLE PYTHON_LIBDIR_NOT_FOUND
+#                     OUTPUT_STRIP_TRAILING_WHITESPACE)
+
     execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print (sysconfig.get_python_version())"
                      OUTPUT_VARIABLE PYTHON_VERSION
                      RESULT_VARIABLE PYTHON_VERSION_NOT_FOUND
@@ -38,15 +41,26 @@ if(PYTHON_EXECUTABLE)
                      RESULT_VARIABLE PYTHON_MAJOR_VERSION_NOT_FOUND
                      OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+    # https://www.python.org/dev/peps/pep-3149/
+    execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print (sysconfig.get_config_var('ABIFLAGS'))"
+                     OUTPUT_VARIABLE PYTHON_ABIFLAGS
+                     RESULT_VARIABLE PYTHON_ABIFLAGS_NOT_FOUND
+                     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+endif()
 
+message('PYTHON_LIBDIR...........'${PYTHON_LIBDIR})
+message("PYTHON_VERSION = " ${PYTHON_VERSION})
+message("PYTHON_ABIFLAGS = " ${PYTHON_ABIFLAGS})
+message("Find Python Library python${PYTHON_VERSION}${PYTHON_ABIFLAGS}")
 
-endif()
+find_library( PYTHON_LIBRARY NAMES "python${PYTHON_VERSION}${PYTHON_ABIFLAGS}"
+	HINTS ${PYTHON_LIBDIR})
 
-if(PYTHON_LIBDIR)
-    find_library( PYTHON_LIBRARY "python${PYTHON_VERSION}" HINTS ${PYTHON_LIBDIR} NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH)
-	message("python${PYTHON_VERSION}")
-endif()
+#if(PYTHON_LIBDIR)
+#    find_library( PYTHON_LIBRARY NAMES "python${PYTHON_VERSION}${PYTHON_ABIFLAGS}")
+## HINTS ${PYTHON_LIBDIR} NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_DEFAULT_PATH)
+#endif()
 
 message("-- Found PYTHON_EXECUTABLE " ${PYTHON_EXECUTABLE})
 message("-- Found PYTHON_VERSION " ${PYTHON_VERSION})

Diff for: slib/CMakeLists.txt

@@ -1,10 +1,12 @@
 # ----------- ibmisc_c
 set(IBMISC_SOURCE
+	ibmisc/string.cpp
 	ibmisc/ibmisc.cpp
 	ibmisc/geodesy.cpp
-	spsparse/spsparse.cpp
 	ibmisc/VarTransformer.cpp
-	ibmisc/ConstantSet.cpp)
+	ibmisc/ConstantSet.cpp
+	spsparse/spsparse.cpp)
+
 
 if (USE_PROJ4)
 	list(APPEND IBMISC_SOURCE ibmisc/Proj2.cpp)

Diff for: slib/ibmisc/string.cpp

@@ -0,0 +1,28 @@
+#include <ibmisc/string.hpp>
+
+namespace ibmisc {
+
+/** Like sprintf(), but returns output in a std::string.  Uses same
+parameters as printf().
+@see http://codereview.stackexchange.com/questions/52522/mimic-sprintf-with-stdstring-output */
+std::string string_printf(const std::string& format, ...)
+{
+	static const int initial_buf_size = 100;
+	va_list arglist;
+	va_start(arglist, format);
+	char buf1[initial_buf_size];
+	const int len = vsnprintf(buf1,initial_buf_size,format.c_str(), arglist) + 1;
+	va_end(arglist);
+
+	if(len<initial_buf_size){
+		return buf1;
+	} else {
+		char buf2[len];
+		va_start(arglist,format);
+		vsnprintf(buf2,len,format.c_str(),arglist);
+		va_end(arglist);
+		return buf2;
+	}
+}
+
+}

Diff for: slib/ibmisc/string.hpp

@@ -1,8 +1,11 @@
 #include <algorithm>
 #include <string>
+#include <cstdarg>
 
 namespace ibmisc {
 
+std::string string_printf(const std::string& format, ...);
+
 inline void toupper(std::string &str) {
 	std::transform(str.begin(), str.end(), str.begin(), ::toupper);
 }

Diff for: tests/ibmisc/test_memory.cpp

@@ -2,6 +2,7 @@
 
 #include <gtest/gtest.h>
 #include <ibmisc/memory.hpp>
+#include <ibmisc/string.hpp>
 #include <iostream>
 #include <cstdio>
 #include <memory>
@@ -55,6 +56,15 @@ TEST_F(MemoryTest, lazy_ptr_test)
 	EXPECT_EQ("hello", *p3);
 }
 
+TEST_F(MemoryTest, string_printf)
+{
+	std::string s1(string_printf("Hello World"));
+	EXPECT_EQ("Hello World", s1);
+
+	std::string s2(string_printf("H%s%d", "ello ", 17));
+	EXPECT_EQ("Hello 17", s2);
+}
+
 
 // -----------------------------------------------------------
 // -----------------------------------------------------------