-DIST libgeodecomp-0.5.0_pre20200314.tar.gz 1506929 BLAKE2B 078a0d3384963b0d3b5e5885d794b4feb6493ab3c4d4df068c300769f6bd8ee1d695accec0f4a702b218d725cc68889450d7d4fbddd495387e75a6804bbd8de9 SHA512 5bc23ce68d91d3cb8ec753a09efc4d7c46aab3c307c529f2f2e09593d14bcb027532aeea32ba99ce524cc6dfb248e983a040f482a47784f5da6fb07aac06a859
DIST libgeodecomp-0.5.0_pre20200420.tar.gz 1507078 BLAKE2B 64d5c9a138c54175ce049a1a02def90553bca617b22c9ac5fa93cd66aebfd7892f5a458f2d3eb3dd987d3c897cbb338b64cb64af7447f6ae74b41d02a762888e SHA512 0e1caa011641fba5af3c32f165fc95ced578ebeb45cb7ef56f1ede416f2e6aef532569a85339e48b43b0050bbfb60ffa1760604577c07137590445a87e691c70
+++ /dev/null
-From fe581cc24805288c6c1a9b26a4b72748906f16c8 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Thu, 26 Mar 2020 15:58:46 +0100
-Subject: [PATCH] hpx: Remove use of deprecated header
-
-The current hpx version is v1.4. Remove the usage of deprecated hpx headers and
-make it compile again.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- src/libgeodecomp/communication/hpxreceiver.h | 5 ++---
- src/libgeodecomp/communication/hpxserializationwrapper.h | 8 ++++----
- .../communication/test/parallel_hpx_4/hpxreceivertest.h | 5 ++---
- src/libgeodecomp/geometry/coord.h | 4 ++--
- src/libgeodecomp/io/mocksteerer.h | 5 +++++
- src/libgeodecomp/io/mockwriter.h | 5 +++++
- src/libgeodecomp/misc/clonable.h | 2 +-
- src/libgeodecomp/misc/nonpodtestcell.h | 2 +-
- src/libgeodecomp/parallelization/hpxsimulator.cpp | 2 +-
- src/libgeodecomp/parallelization/hpxsimulator.h | 9 ++++-----
- src/libgeodecomp/storage/displacedgrid.h | 4 ++--
- src/libgeodecomp/storage/grid.h | 4 ++--
- src/libgeodecomp/storage/patchprovider.h | 3 ++-
- .../storage/test/unit/reorderingunstructuredgridtest.h | 4 ++--
- 14 files changed, 35 insertions(+), 27 deletions(-)
-
-diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
-index 1a0baf9bbdee..beb657b88bbc 100644
---- a/src/libgeodecomp/communication/hpxreceiver.h
-+++ b/src/libgeodecomp/communication/hpxreceiver.h
-@@ -10,10 +10,9 @@
-
- #include <hpx/include/components.hpp>
- #include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
--#include <hpx/lcos/local/receive_buffer.hpp>
-+#include <hpx/collectives/broadcast.hpp>
-+#include <hpx/local_lcos/receive_buffer.hpp>
- #include <hpx/runtime/get_ptr.hpp>
--#include <hpx/util/unwrapped.hpp>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
- #include <libgeodecomp/misc/stringops.h>
-
-diff --git a/src/libgeodecomp/communication/hpxserializationwrapper.h b/src/libgeodecomp/communication/hpxserializationwrapper.h
-index 5ebf06c4cf7c..0afb145840a6 100644
---- a/src/libgeodecomp/communication/hpxserializationwrapper.h
-+++ b/src/libgeodecomp/communication/hpxserializationwrapper.h
-@@ -10,10 +10,10 @@
- * just pull in this header.
- */
- #include <libgeodecomp/communication/hpxserialization.h>
--#include <hpx/runtime/serialization/map.hpp>
--#include <hpx/runtime/serialization/serialize.hpp>
--#include <hpx/runtime/serialization/shared_ptr.hpp>
--#include <hpx/runtime/serialization/vector.hpp>
-+#include <hpx/serialization/map.hpp>
-+#include <hpx/serialization/serialize.hpp>
-+#include <hpx/serialization/shared_ptr.hpp>
-+#include <hpx/serialization/vector.hpp>
-
- #endif
-
-diff --git a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
-index ab16a0947546..b2f9c6d47559 100644
---- a/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
-+++ b/src/libgeodecomp/communication/test/parallel_hpx_4/hpxreceivertest.h
-@@ -1,9 +1,8 @@
- #include <cxxtest/TestSuite.h>
- #include <hpx/hpx.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/collectives/broadcast.hpp>
- #include <hpx/runtime/components/component_factory.hpp>
--#include <hpx/runtime/serialization/serialize_buffer.hpp>
--#include <hpx/util/unwrapped.hpp>
-+#include <hpx/serialization/serialize_buffer.hpp>
- #include <libgeodecomp/communication/hpxreceiver.h>
- #include <libgeodecomp/misc/stringops.h>
-
-diff --git a/src/libgeodecomp/geometry/coord.h b/src/libgeodecomp/geometry/coord.h
-index 5df21310d3ee..8772980c52df 100644
---- a/src/libgeodecomp/geometry/coord.h
-+++ b/src/libgeodecomp/geometry/coord.h
-@@ -10,8 +10,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <hpx/config.hpp>
--#include <hpx/runtime/serialization/array.hpp>
--#include <hpx/runtime/serialization/serialize.hpp>
-+#include <hpx/serialization/array.hpp>
-+#include <hpx/serialization/serialize.hpp>
- #endif
-
- // For Intel MPI we need to source mpi.h before stdio.h:
-diff --git a/src/libgeodecomp/io/mocksteerer.h b/src/libgeodecomp/io/mocksteerer.h
-index 4ab2d28c5097..e20d0d5bb6bf 100644
---- a/src/libgeodecomp/io/mocksteerer.h
-+++ b/src/libgeodecomp/io/mocksteerer.h
-@@ -4,6 +4,11 @@
- #include <sstream>
- #include <libgeodecomp/io/steerer.h>
-
-+#ifdef LIBGEODECOMP_WITH_HPX
-+#include <hpx/include/threads.hpp>
-+#include <hpx/concurrency/spinlock.hpp>
-+#endif
-+
- namespace LibGeoDecomp {
-
- namespace MockSteererHelpers {
-diff --git a/src/libgeodecomp/io/mockwriter.h b/src/libgeodecomp/io/mockwriter.h
-index 4d6d13c93acb..36cb7e1e1ae6 100644
---- a/src/libgeodecomp/io/mockwriter.h
-+++ b/src/libgeodecomp/io/mockwriter.h
-@@ -8,6 +8,11 @@
- #include <libgeodecomp/misc/clonable.h>
- #include <libgeodecomp/misc/testcell.h>
-
-+#ifdef LIBGEODECOMP_WITH_HPX
-+#include <hpx/include/threads.hpp>
-+#include <hpx/concurrency/spinlock.hpp>
-+#endif
-+
- #include <sstream>
-
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/misc/clonable.h b/src/libgeodecomp/misc/clonable.h
-index 8162513826b8..a1dccbf94bd3 100644
---- a/src/libgeodecomp/misc/clonable.h
-+++ b/src/libgeodecomp/misc/clonable.h
-@@ -5,7 +5,7 @@
-
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
--#include <hpx/runtime/serialization/base_object.hpp>
-+#include <hpx/serialization/base_object.hpp>
- #endif
-
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/misc/nonpodtestcell.h b/src/libgeodecomp/misc/nonpodtestcell.h
-index 66453ce80ba7..1618c8359b90 100644
---- a/src/libgeodecomp/misc/nonpodtestcell.h
-+++ b/src/libgeodecomp/misc/nonpodtestcell.h
-@@ -11,7 +11,7 @@
- #endif
-
- #ifdef LIBGEODECOMP_WITH_HPX
--#include <hpx/runtime/serialization/set.hpp>
-+#include <hpx/serialization/set.hpp>
- #endif
-
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/parallelization/hpxsimulator.cpp b/src/libgeodecomp/parallelization/hpxsimulator.cpp
-index 6e2fb6c78519..0329d6815913 100644
---- a/src/libgeodecomp/parallelization/hpxsimulator.cpp
-+++ b/src/libgeodecomp/parallelization/hpxsimulator.cpp
-@@ -3,7 +3,7 @@
-
- #include <libgeodecomp/parallelization/hpxsimulator.h>
- #include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/collectives/broadcast.hpp>
-
- namespace LibGeoDecomp {
- namespace HpxSimulatorHelpers {
-diff --git a/src/libgeodecomp/parallelization/hpxsimulator.h b/src/libgeodecomp/parallelization/hpxsimulator.h
-index 1ccdf883e915..15b5a3628f9d 100644
---- a/src/libgeodecomp/parallelization/hpxsimulator.h
-+++ b/src/libgeodecomp/parallelization/hpxsimulator.h
-@@ -6,11 +6,10 @@
-
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <hpx/config.hpp>
--#include <hpx/runtime/serialization/set.hpp>
--#include <hpx/runtime/serialization/string.hpp>
--#include <hpx/runtime/serialization/vector.hpp>
--#include <hpx/include/lcos.hpp>
--#include <hpx/lcos/broadcast.hpp>
-+#include <hpx/serialization/set.hpp>
-+#include <hpx/serialization/string.hpp>
-+#include <hpx/serialization/vector.hpp>
-+#include <hpx/collectives/broadcast.hpp>
-
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
- #include <libgeodecomp/geometry/partitions/stripingpartition.h>
-diff --git a/src/libgeodecomp/storage/displacedgrid.h b/src/libgeodecomp/storage/displacedgrid.h
-index 5c72e520ce48..a8831053fedc 100644
---- a/src/libgeodecomp/storage/displacedgrid.h
-+++ b/src/libgeodecomp/storage/displacedgrid.h
-@@ -19,8 +19,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #endif
-
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/storage/grid.h b/src/libgeodecomp/storage/grid.h
-index 6e218696f625..821b02002c87 100644
---- a/src/libgeodecomp/storage/grid.h
-+++ b/src/libgeodecomp/storage/grid.h
-@@ -26,8 +26,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #endif
-
- namespace LibGeoDecomp {
-diff --git a/src/libgeodecomp/storage/patchprovider.h b/src/libgeodecomp/storage/patchprovider.h
-index 71fda8091e95..66aa67f214fa 100644
---- a/src/libgeodecomp/storage/patchprovider.h
-+++ b/src/libgeodecomp/storage/patchprovider.h
-@@ -2,7 +2,8 @@
- #define LIBGEODECOMP_STORAGE_PATCHPROVIDER_H
-
- #ifdef LIBGEODECOMP_WITH_HPX
--#include <hpx/lcos/local/spinlock.hpp>
-+#include <hpx/include/threads.hpp>
-+#include <hpx/synchronization/spinlock.hpp>
- #include <mutex>
- #endif
-
-diff --git a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
-index d89146a4bf69..7cb5203dae44 100644
---- a/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
-+++ b/src/libgeodecomp/storage/test/unit/reorderingunstructuredgridtest.h
-@@ -19,8 +19,8 @@
- #ifdef LIBGEODECOMP_WITH_HPX
- #include <libgeodecomp/misc/cudaboostworkaround.h>
- #include <libgeodecomp/communication/hpxserializationwrapper.h>
--#include <hpx/runtime/serialization/input_archive.hpp>
--#include <hpx/runtime/serialization/output_archive.hpp>
-+#include <hpx/serialization/input_archive.hpp>
-+#include <hpx/serialization/output_archive.hpp>
- #endif
-
- using namespace LibGeoDecomp;
---
-2.24.1
-
+++ /dev/null
-From b03cef449361bef6d65f40382227714e0e0980c3 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 21 Feb 2020 19:47:51 +0100
-Subject: [PATCH] cmake: Fix library installation directory
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- src/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b82d667087ba..f4ea6b379ec7 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -335,11 +335,12 @@ endif()
- target_link_libraries(geodecomp ${LIBGEODECOMP_LINK_LIBRARIES})
-
- #============= 6. INSTALLER CONFIG ===================================
-+include(GNUInstallDirs)
- install(
- TARGETS geodecomp
- EXPORT ${PACKAGE_NAME}-targets
-- ARCHIVE DESTINATION lib
-- LIBRARY DESTINATION lib)
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- install(FILES "${CMAKE_BINARY_DIR}/${PACKAGE_NAME}/config.h" DESTINATION include/${PACKAGE_NAME})
- install(FILES libgeodecomp.h DESTINATION include)
---
-2.24.1
-
+++ /dev/null
-From 55356ab9c03cd25efeb5176761f2f5b3744b4371 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Fri, 24 Jan 2020 17:59:48 +0100
-Subject: [PATCH] cmake: Disable mpiruns
-
-The mpiruns will violate the sandboxing. Therefore, disable them including
-scotch.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- CMakeLists.txt | 14 +-
- CMakeModules/FindSCOTCH.cmake | 238 +++++++++++++++++-----------------
- 2 files changed, 121 insertions(+), 131 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed5cc607c3ed..fec488002958 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -238,19 +238,9 @@ if (MACHINE_ARCH MATCHES "x86_64")
- set(AMD64_LINUX true)
- endif()
-
--# test if mpirun/mpiexec supports the --oversubscribe flag:
-+# use the --oversubscribe flag:
- if(MPI_FOUND)
-- execute_process(
-- COMMAND ${MPIEXEC} --oversubscribe ${MPIEXEC_NUMPROC_FLAG} 4 echo ok
-- RESULT_VARIABLE MPIEXEC_OVERSUBSCRIBE_RETURN_CODE
-- OUTPUT_QUIET
-- ERROR_QUIET)
--
-- if (MPIEXEC_OVERSUBSCRIBE_RETURN_CODE EQUAL 0)
-- set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
-- else()
-- set(MPIEXEC_OVERSUBSCRIBE_FLAG "")
-- endif()
-+ set(MPIEXEC_OVERSUBSCRIBE_FLAG "--oversubscribe")
- endif()
-
- #============= 3. CONFIGURABLE BUILD OPTIONS =========================
-diff --git a/CMakeModules/FindSCOTCH.cmake b/CMakeModules/FindSCOTCH.cmake
-index 5c717977dbba..146c2bf8bb60 100644
---- a/CMakeModules/FindSCOTCH.cmake
-+++ b/CMakeModules/FindSCOTCH.cmake
-@@ -233,125 +233,125 @@ int main() {
- ")
-
- message(STATUS "Performing test SCOTCH_TEST_RUNS")
-- try_run(
-- SCOTCH_TEST_LIB_EXITCODE
-- SCOTCH_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
-- )
--
-- if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- # Output some variables
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
--
-- # If program does not run, try adding zlib library and test again
-- if(NOT SCOTCH_TEST_RUNS)
-- if (NOT ZLIB_FOUND)
-- find_package(ZLIB)
-- endif()
--
-- if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
-- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
--
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
-- try_run(
-- SCOTCH_ZLIB_TEST_LIB_EXITCODE
-- SCOTCH_ZLIB_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
-- )
--
-- # Add zlib flags if required and set test run to 'true'
-- if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
-- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
--
-- endif()
-- endif()
--
-- if(NOT SCOTCH_TEST_RUNS)
-- if (NOT BZIP2_FOUND)
-- find_package(BZip2)
-- endif()
--
-- if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
-- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
--
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
-- try_run(
-- SCOTCH_BZIP2_TEST_LIB_EXITCODE
-- SCOTCH_BZIP2_TEST_LIB_COMPILED
-- ${CMAKE_CURRENT_BINARY_DIR}
-- ${SCOTCH_TEST_LIB_CPP}
-- CMAKE_FLAGS
-- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-- "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-- COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
-- RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
-- )
--
-- # Add zlib flags if required and set test run to 'true'
-- if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
-- set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
-- set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
-- set(SCOTCH_TEST_RUNS TRUE)
-- else()
-- message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
-- if (SCOTCH_DEBUG)
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-- "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-- endif()
-- endif()
-- endif()
-- endif()
-+ # try_run(
-+ # SCOTCH_TEST_LIB_EXITCODE
-+ # SCOTCH_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_TEST_LIB_OUTPUT
-+ # )
-+
-+ # if (SCOTCH_TEST_LIB_COMPILED AND SCOTCH_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Success")
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # # Output some variables
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_COMPILED = ${SCOTCH_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+
-+ # # If program does not run, try adding zlib library and test again
-+ # if(NOT SCOTCH_TEST_RUNS)
-+ # if (NOT ZLIB_FOUND)
-+ # find_package(ZLIB)
-+ # endif()
-+
-+ # if (ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES)
-+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
-+
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS")
-+ # try_run(
-+ # SCOTCH_ZLIB_TEST_LIB_EXITCODE
-+ # SCOTCH_ZLIB_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_ZLIB_TEST_LIB_OUTPUT
-+ # )
-+
-+ # # Add zlib flags if required and set test run to 'true'
-+ # if (SCOTCH_ZLIB_TEST_LIB_COMPILED AND SCOTCH_ZLIB_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Success")
-+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
-+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${ZLIB_LIBRARIES})
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_ZLIB_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILED = ${SCOTCH_ZLIB_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_ZLIB_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+
-+ # endif()
-+ # endif()
-+
-+ # if(NOT SCOTCH_TEST_RUNS)
-+ # if (NOT BZIP2_FOUND)
-+ # find_package(BZip2)
-+ # endif()
-+
-+ # if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-+ # set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${BZIP2_INCLUDE_DIR})
-+ # set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${BZIP2_LIBRARIES})
-+
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS")
-+ # try_run(
-+ # SCOTCH_BZIP2_TEST_LIB_EXITCODE
-+ # SCOTCH_BZIP2_TEST_LIB_COMPILED
-+ # ${CMAKE_CURRENT_BINARY_DIR}
-+ # ${SCOTCH_TEST_LIB_CPP}
-+ # CMAKE_FLAGS
-+ # "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}"
-+ # "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}"
-+ # COMPILE_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT
-+ # RUN_OUTPUT_VARIABLE SCOTCH_BZIP2_TEST_LIB_OUTPUT
-+ # )
-+
-+ # # Add zlib flags if required and set test run to 'true'
-+ # if (SCOTCH_BZIP2_TEST_LIB_COMPILED AND SCOTCH_BZIP2_TEST_LIB_EXITCODE EQUAL 0)
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Success")
-+ # set(SCOTCH_INCLUDE_DIRS ${SCOTCH_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
-+ # set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${BZIP2_LIBRARIES})
-+ # set(SCOTCH_TEST_RUNS TRUE)
-+ # else()
-+ # message(STATUS "Performing test SCOTCH_BZIP2_TEST_RUNS - Failed")
-+ # if (SCOTCH_DEBUG)
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_BZIP2_TEST_LIB_COMPILED = ${SCOTCH_BZIP2_TEST_LIB_COMPILED}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT = ${SCOTCH_BZIP2_TEST_LIB_COMPILE_OUTPUT}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_EXITCODE = ${SCOTCH_TEST_LIB_EXITCODE}")
-+ # message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-+ # "SCOTCH_TEST_LIB_OUTPUT = ${SCOTCH_TEST_LIB_OUTPUT}")
-+ # endif()
-+ # endif()
-+ # endif()
-+ # endif()
-
- endif()
- endif()
---
-2.24.1
-
+++ /dev/null
-From 87e1918e13fa3f3124e945a0ea12cfb339ddf303 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Thu, 26 Mar 2020 16:05:02 +0100
-Subject: [PATCH] hpx: receiver: Remove std::move() call
-
-This fixes the following warning:
-
-|/home/kurt/git/libgeodecomp/src/libgeodecomp/communication/hpxreceiver.h:138:29: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
-| 138 | return std::move(vec);
-
-The compiler should be smart enough to optimize the correct way :).
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- src/libgeodecomp/communication/hpxreceiver.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libgeodecomp/communication/hpxreceiver.h b/src/libgeodecomp/communication/hpxreceiver.h
-index beb657b88bbc..28de314d5ef5 100644
---- a/src/libgeodecomp/communication/hpxreceiver.h
-+++ b/src/libgeodecomp/communication/hpxreceiver.h
-@@ -135,7 +135,7 @@ public:
- vec << receiver->get(i).get();
- }
-
-- return std::move(vec);
-+ return vec;
- }
-
- private:
---
-2.24.1
-
+++ /dev/null
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake cuda virtualx
-
-MY_COMMIT="09529db4b3f458f93a0240be578d1da6f1c2dc21"
-
-DESCRIPTION="An auto-parallelizing library to speed up computer simulations"
-HOMEPAGE="
- http://www.libgeodecomp.org
- https://github.com/STEllAR-GROUP/libgeodecomp"
-SRC_URI="https://github.com/STEllAR-GROUP/libgeodecomp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda doc hpx mpi opencl opencv qt5 silo"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- app-text/texlive
- media-gfx/graphviz
- )"
-RDEPEND="dev-libs/boost"
-DEPEND="${RDEPEND}
- ~dev-libs/libflatarray-0.4.0_pre20200314
- cuda? ( dev-util/nvidia-cuda-toolkit )
- hpx? ( sys-cluster/hpx )
- mpi? ( virtual/mpi )
- opencl? ( virtual/opencl )
- opencv? ( media-libs/opencv )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- silo? ( sci-libs/silo )"
-
-S="${WORKDIR}/libgeodecomp-${MY_COMMIT}"
-
-PATCHES=(
- "${FILESDIR}/${P}-hpx.patch"
- "${FILESDIR}/${P}-libdir.patch"
- "${FILESDIR}/${P}-mpi.patch"
- "${FILESDIR}/${P}-warnings.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- use cuda && cuda_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CUDA=$(usex cuda)
- -DWITH_HPX=$(usex hpx)
- -DWITH_MPI=$(usex mpi)
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCV=$(usex opencv)
- -DWITH_QT5=$(usex qt5)
- -DWITH_SCOTCH=false
- -DWITH_SILO=$(usex silo)
- -DWITH_TYPEMAPS=false
- -DWITH_VISIT=false
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use doc && cmake_build doc
-}
-
-src_install() {
- DOCS=( README )
- use doc && HTML_DOCS=( doc/html/* )
- cmake_src_install
-}
-
-src_test() {
- virtx cmake_build check
-}
projects / gentoo.git / commitdiff