From 0d84384fd6eab92cfbb6691a485c7124fbd25e1d Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Fri, 20 Dec 2019 12:41:44 -0600 Subject: [PATCH 1/6] is it working on mac? --- CMakeLists.txt | 1 - cli/CMakeLists.txt | 2 ++ cyclus/system.py | 6 +++++- tests/CMakeLists.txt | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32b74ee15c..4787befe34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -337,7 +337,6 @@ IF(NOT CYCLUS_DOC_ONLY) # make sure we know about having python add_definitions(-DCYCLUS_WITH_PYTHON) - set(LIBS ${LIBS} ${PYTHON_LIBRARIES}) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/cyclus") else(Cython_FOUND) # If we don't have Python bindings, we may try to find tcmalloc. diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 4c49ebe0fb..766468c99e 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -8,10 +8,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CYCLUS_CORE_INCLUDE_DIRS}) SET(CYCLUS_SOURCE ${CYCLUS_SOURCE} cyclus.cc ) +SET(LIBS ${PYTHON_LIBRARIES} ${LIBS}) ADD_EXECUTABLE(cyclus_cli ${CYCLUS_SOURCE}) set_target_properties(cyclus_cli PROPERTIES OUTPUT_NAME cyclus) + TARGET_LINK_LIBRARIES(cyclus_cli dl ${LIBS} cyclus) INSTALL( diff --git a/cyclus/system.py b/cyclus/system.py index 53c3486039..a4b4ace30a 100644 --- a/cyclus/system.py +++ b/cyclus/system.py @@ -31,6 +31,10 @@ try: import concurrent_futures except ImportError: - concurrent_futures = None + try: + from concurrent import futures as concurrent_futures + except ImportError: + concurrent_futures = None + diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ffec6ecfaa..c74b976f0a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,6 +27,7 @@ ENDIF() SET(GTest "${CMAKE_CURRENT_SOURCE_DIR}/GoogleTest/gtest/gtest-all.cc" ) +SET(LIBS ${PYTHON_LIBRARIES} ${LIBS}) INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}") From 4ef015dc9fdf592347b2ed843768c020739cdae8 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Fri, 20 Dec 2019 13:35:08 -0600 Subject: [PATCH 2/6] this fixes it for ubuntu --- CMakeLists.txt | 4 ++++ cli/CMakeLists.txt | 4 +++- tests/CMakeLists.txt | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4787befe34..5ce552e611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -337,6 +337,10 @@ IF(NOT CYCLUS_DOC_ONLY) # make sure we know about having python add_definitions(-DCYCLUS_WITH_PYTHON) + IF (NOT APPLE) + MESSAGE("ININININHBJGVHGCVGFCGFCGFCGFCGFCGFCGFCGFC:") + set(LIBS ${LIBS} ${PYTHON_LIBRARIES}) + ENDIF (!APPLE) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/cyclus") else(Cython_FOUND) # If we don't have Python bindings, we may try to find tcmalloc. diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 766468c99e..a6da748df0 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -8,7 +8,9 @@ INCLUDE_DIRECTORIES(BEFORE ${CYCLUS_CORE_INCLUDE_DIRS}) SET(CYCLUS_SOURCE ${CYCLUS_SOURCE} cyclus.cc ) -SET(LIBS ${PYTHON_LIBRARIES} ${LIBS}) +IF (APPLE) + SET(LIBS ${PYTHON_LIBRARIES} ${LIBS}) +ENDIF(APPLE) ADD_EXECUTABLE(cyclus_cli ${CYCLUS_SOURCE}) set_target_properties(cyclus_cli PROPERTIES OUTPUT_NAME cyclus) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c74b976f0a..ffec6ecfaa 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,7 +27,6 @@ ENDIF() SET(GTest "${CMAKE_CURRENT_SOURCE_DIR}/GoogleTest/gtest/gtest-all.cc" ) -SET(LIBS ${PYTHON_LIBRARIES} ${LIBS}) INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}") From 933f2e627a7213cb49b85718e4baa74842cef431 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 23 Dec 2019 14:38:06 -0600 Subject: [PATCH 3/6] cleaning... --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ce552e611..eab60e9a26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,7 +338,6 @@ IF(NOT CYCLUS_DOC_ONLY) # make sure we know about having python add_definitions(-DCYCLUS_WITH_PYTHON) IF (NOT APPLE) - MESSAGE("ININININHBJGVHGCVGFCGFCGFCGFCGFCGFCGFCGFC:") set(LIBS ${LIBS} ${PYTHON_LIBRARIES}) ENDIF (!APPLE) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/cyclus") From 389656893ea0ea7c0abf28d1b864f515f4e4a819 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 23 Dec 2019 15:06:57 -0600 Subject: [PATCH 4/6] adding news --- news/python_lib.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 news/python_lib.rst diff --git a/news/python_lib.rst b/news/python_lib.rst new file mode 100644 index 0000000000..3037c9e163 --- /dev/null +++ b/news/python_lib.rst @@ -0,0 +1,15 @@ +**Added:** None + +**Changed:** +- for MACOS only link against PYTHON lib in the binary building process. It + should not be required when building the Python package as python knows about + it self. For some reason, this is only true (and working) on MACOS, and was an issue when + using Conda to install Python and other CYclus deps. + +**Deprecated:** None + +**Removed:** None + +**Fixed:** None + +**Security:** None From 5ad0c9a61d5b0fac901cf9c0d3c1e4ea382b42b1 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 13 Jan 2020 11:22:45 -0600 Subject: [PATCH 5/6] consistancy --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eab60e9a26..5fd0f711e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,7 +339,7 @@ IF(NOT CYCLUS_DOC_ONLY) add_definitions(-DCYCLUS_WITH_PYTHON) IF (NOT APPLE) set(LIBS ${LIBS} ${PYTHON_LIBRARIES}) - ENDIF (!APPLE) + ENDIF (NOT APPLE) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/cyclus") else(Cython_FOUND) # If we don't have Python bindings, we may try to find tcmalloc. From a58931c37b4807d15c062b4d1782b12de7750a75 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot <15145274+bam241@users.noreply.github.com> Date: Mon, 13 Jan 2020 11:59:01 -0600 Subject: [PATCH 6/6] Update cli/CMakeLists.txt Co-Authored-By: Jordan Stomps --- cli/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index a6da748df0..41f98a6e3c 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -15,7 +15,6 @@ ENDIF(APPLE) ADD_EXECUTABLE(cyclus_cli ${CYCLUS_SOURCE}) set_target_properties(cyclus_cli PROPERTIES OUTPUT_NAME cyclus) - TARGET_LINK_LIBRARIES(cyclus_cli dl ${LIBS} cyclus) INSTALL(