HOTFIX | Fix to #397 (#399)

* Fix to #397

* NUMPY is essential dependency; therefore numpy code is no longer
included conditionally. USE_NUMPY is implied and have been removed from
cmake.

* Minor cleanup in macros and loggers.
numCores now use thread library to determine number of available
threads.

* include cmath in Pool.cpp as well. Failed compilation with gcc5.3

* include cmath in Pool.cpp as well. Failed compilation with gcc5.3

Co-authored-by: Dilawar Singh <[email protected]>
Co-authored-by: dilawars <[email protected]>

Author: 3 people

biophysics/CompartmentBase.h

@@ -11,14 +11,6 @@
 #ifndef _COMPARTMENT_BASE_H
 #define _COMPARTMENT_BASE_H
 
-#ifdef  CYMOOSE
-
-template<typename A>
-class SrcFinfo1;
-
-
-#endif     /* -----  CYMOOSE  ----- */
-
 /**
  * The CompartmentBase class sets up the interface for all the
  * derived Compartment classes, used in

kinetics/Pool.cpp

@@ -7,6 +7,8 @@
 ** See the file COPYING.LIB for the full notice.
 **********************************************************************/
 
+#include <cmath>
+
 #include "../basecode/header.h"
 #include "../basecode/ElementValueFinfo.h"
 #include "../utility/print_function.hpp"

pymoose/CMakeLists.txt

@@ -15,7 +15,6 @@ endif()
 
 include_directories(${NUMPY_INCLUDE_DIRS})
 add_definitions(-std=c++11)
-add_definitions(-DUSE_NUMPY)
 add_definitions(-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
 
 set(PYTHON_SO_EXTENSION ".so")