Skip to content

Commit 868fce7

Browse files
dilawarDilawar Singhdilawars
authored
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 <dilawars@ncbs.res.in> Co-authored-by: dilawars <dilawars@nargis.ncbs.res.in>
1 parent 0e85a57 commit 868fce7

File tree

11 files changed

+2721
-3840
lines changed

11 files changed

+2721
-3840
lines changed

biophysics/CompartmentBase.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@
1111
#ifndef _COMPARTMENT_BASE_H
1212
#define _COMPARTMENT_BASE_H
1313

14-
#ifdef CYMOOSE
15-
16-
template<typename A>
17-
class SrcFinfo1;
18-
19-
20-
#endif /* ----- CYMOOSE ----- */
21-
2214
/**
2315
* The CompartmentBase class sets up the interface for all the
2416
* derived Compartment classes, used in

kinetics/Pool.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
** See the file COPYING.LIB for the full notice.
88
**********************************************************************/
99

10+
#include <cmath>
11+
1012
#include "../basecode/header.h"
1113
#include "../basecode/ElementValueFinfo.h"
1214
#include "../utility/print_function.hpp"

pymoose/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ endif()
1515

1616
include_directories(${NUMPY_INCLUDE_DIRS})
1717
add_definitions(-std=c++11)
18-
add_definitions(-DUSE_NUMPY)
1918
add_definitions(-DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
2019

2120
set(PYTHON_SO_EXTENSION ".so")

0 commit comments

Comments
 (0)