gemfony
diff --git a/‎.clang-format‎
Lines changed: 31 additions & 0 deletions b/‎.clang-format‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 3 additions & 0 deletions b/‎.gitignore‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎CHANGES‎
Lines changed: 35 additions & 0 deletions b/‎CHANGES‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎CMakeLists.txt‎
Lines changed: 26 additions & 8 deletions b/‎CMakeLists.txt‎
Lines changed: 26 additions & 8 deletions
diff --git a/‎CMakeModules/CMakeLists.txt‎
Lines changed: 35 additions & 1 deletion b/‎CMakeModules/CMakeLists.txt‎
Lines changed: 35 additions & 1 deletion
diff --git a/‎CMakeModules/CommonGenevaBuild.cmake‎
Lines changed: 20 additions & 24 deletions b/‎CMakeModules/CommonGenevaBuild.cmake‎
Lines changed: 20 additions & 24 deletions
diff --git a/‎CMakeModules/IdentifySystemParameters.cmake‎
Lines changed: 14 additions & 22 deletions b/‎CMakeModules/IdentifySystemParameters.cmake‎
Lines changed: 14 additions & 22 deletions
@@ -0,0 +1,31 @@
+# This .clang-format replicates the style shown in GBoundedBufferT.hpp
+Language: Cpp
+BasedOnStyle: LLVM
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+AccessModifierOffset: -4
+BreakBeforeBraces: BS_Attach
+BraceWrapping:
+  AfterClass: true
+  AfterControlStatement: false
+  AfterEnum: true
+  AfterFunction: false
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  IndentBraces: false
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterDeclarationReturnType: All
+BinPackParameters: false
+AlignAfterOpenBracket: BlockIndent
+SpaceBeforeParensControlStatements: Always
+SpaceBeforeParensFunctionDecl: false
+SpaceBeforeParensFunctionCall: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortBlocksOnASingleLine: false
+ColumnLimit:     120
+AlignTrailingComments: true
+
+
@@ -5,3 +5,6 @@
 /.cproject
 .DS_Store
 .com.apple.*
+build/
+cmake-build-*/
+.vscode
@@ -1,3 +1,38 @@
+//------------------------------------------------------------------------------------------------------
+* Version 1.11, "Hendaye" - March 16, 2026
+
+We have restarted development of the Geneva library!
+
+Recommended versions:
+- Boost version 1.90 or higher is required. You may try with Boost 1.89 (untested). Note that the
+  Boost.System library linkage has been removed from the build-system, as that library is now header-only. So
+  in order to get Geneva to compiler with older Boost versions you may have to modify the build-system (see
+  the various instances of CommonGenevaBuild.cmake).
+- CMake version 3.27 or higher is required
+- GCC is recommended to be at least version 13, clang should be at least version 18.
+  Earlier versions might work if C++20 is sufficiently supported
+- We suggest to use Ubuntu 24.04 LTS as the host platform if you plan to use the CUDA example.
+
+********************** INCOMPATIBILITIES / PLEASE NOTE *************************
+
+- Geneva now uses C++20 constructs, hence you need a compiler that supports this.
+  It is thus also recommended to compile Boost with C++20 support, to be consistent
+
+************************* Misc *************************************************
+
+- Where CUDA is available, random numbers will now be calculated on the GPU
+- A new CUDA example has been added
+- boost::optional, boost::any, boost::filesystem, boost::variant have been replaced
+  by their C++17 counterparts
+- Benchmarks for courtier and geneva have been moved to their own benchmarks top-level
+  directory and are no longer considered to be tests
+- An extensive CUDA example has been implemented
+
+********************************************************************************
+
+Current issues with this development release:
+- The C++ standard is not set centrally, but individually for each library
+
 //------------------------------------------------------------------------------------------------------
 * Version 1.10, "Genova" - March 10, 2020
 
 
@@ -34,11 +34,11 @@
 #
 ################################################################################
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.27 FATAL_ERROR)
 
 MESSAGE ("")
 
-PROJECT (Geneva_Library_Collection)
+PROJECT (Geneva_Library_Collection LANGUAGES CXX CUDA)
 
 ################################################################################
 # We create some examples and test programs as part of the build process.
@@ -50,9 +50,13 @@ PROJECT (Geneva_Library_Collection)
 SET(GENEVA_FULL_TREE_BUILD TRUE)
 
 ################################################################################
-# Set this variable to make all examples run as part of the testing with CTest.
+# Set these variables to make all examples and/or benchmarks run as part of the
+# testing with CTest.
 
-#SET(GENEVA_RUN_EXAMPLES_AS_TESTS TRUE)
+# NOTE: Not yet functional
+
+SET(GENEVA_RUN_EXAMPLES_AS_TESTS FALSE)
+SET(GENEVA_RUN_BENCHMARKS_AS_TESTS FALSE)
 
 ################################################################################
 # Different subcomponents of the Geneva binary tree can be installed in
@@ -77,6 +81,12 @@ ENDIF()
 
 SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules")
 
+################################################################################
+# Set preprocessor define to use in source code if building with MPI consumer
+IF (GENEVA_BUILD_WITH_MPI_CONSUMER)
+	ADD_COMPILE_DEFINITIONS(GENEVA_BUILD_WITH_MPI_CONSUMER)
+ENDIF ()
+
 ###############################################################################
 # Include the shared functionality module for any Geneva build
 
@@ -87,7 +97,7 @@ INCLUDE(CommonGenevaBuild)
 # versions while even minor numbers stand for production releases.
 
 SET(VERSION_MAJOR "1")
-SET(VERSION_MINOR "10")
+SET(VERSION_MINOR "11")
 SET(VERSION_PATCH "0")
 
 SET(GENEVA_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
@@ -128,16 +138,24 @@ IF( GENEVA_BUILD_TESTS )
 ENDIF()
 
 # Examples are also run as tests if enabled with 'GENEVA_RUN_EXAMPLES_AS_TESTS'
-ADD_SUBDIRECTORY (examples)
+IF( GENEVA_BUILD_EXAMPLES )
+	ADD_SUBDIRECTORY (examples)
+ENDIF()
+
+# Benchmarks are also run as tests if enabled with GENEVA_RUN_BENCHMARKS_AS_TESTS
+IF( GENEVA_BUILD_BENCHMARKS )
+	ADD_SUBDIRECTORY (benchmarks)
+ENDIF()
 
-# Holds an incubator facility for new optimization algorihms
+# Holds an incubator facility for new optimization algorithms
 # ADD_SUBDIRECTORY (incubator)
 
 ################################################################################
 # Custom target for all compilable items in the distribution
 ADD_CUSTOM_TARGET(
 	"gemfony-build-all" DEPENDS
 	core
+	benchmarks
 	examples
 	tests
 	# incubator
@@ -240,7 +258,7 @@ SET(CPACK_RPM_PACKAGE_LICENSE "Apache License 2.0")
 SET(CPACK_RPM_PACKAGE_GROUP "Sciences/Libraries")
 SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel >= ${GENEVA_MIN_BOOST_VERSION}")
 
-# Detect the distribution to autoselect the package generator...
+# Detect the distribution to autos-elect the package generator...
 EXECUTE_PROCESS(COMMAND lsb_release -is
 	OUTPUT_VARIABLE CPACK_AUX_DISTRO
 )
 
@@ -1,4 +1,38 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+################################################################################
+#
+# This file is part of the Geneva library collection. The following license
+# applies to this file:
+#
+# ------------------------------------------------------------------------------
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------------------
+#
+# Note that other files in the Geneva library collection may use a different
+# license. Please see the licensing information in each file.
+#
+################################################################################
+#
+# Geneva was started by Dr. Rüdiger Berlich and was later maintained together
+# with Dr. Ariel Garcia under the auspices of Gemfony scientific. For further
+# information on Gemfony scientific, see http://www.gemfomy.eu .
+#
+# The majority of files in Geneva was released under the Apache license v2.0
+# in February 2020.
+#
+# See the NOTICE file in the top-level directory of the Geneva library
+# collection for a list of contributors and copyright information.
+#
+################################################################################
 
 SET ( CMAKEFILES
 	README
 
@@ -41,7 +41,7 @@
 
 ################################################################################
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.27 FATAL_ERROR)
 
 # Include guard
 IF(NOT COMMON_GENEVA_BUILD_INCLUDED)
@@ -99,13 +99,14 @@ FLAG_UNSUPPORTED_SETUPS(
 ################################################################################
 # Set the C++ standard to be used
 
-# Geneva requires at least the C++14 Standard. The user may force another
-# value at its own risk by setting the variable CMAKE_CXX_STANDARD.
+# Geneva requires at least the C++20 Standard. The user may force another
+# value at his own risk by setting the variable CMAKE_CXX_STANDARD.
 IF( NOT DEFINED CMAKE_CXX_STANDARD )
-	SET( CMAKE_CXX_STANDARD "14" )
+	SET( CMAKE_CXX_STANDARD "20" )
 ENDIF()
 
-SET_CXX_STANDARD_FLAG()
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 ################################################################################
 # Set the compiler and linker flags
@@ -159,16 +160,8 @@ ENDIF ()
 
 SET (Boost_USE_MULTITHREAD ON)
 SET (Boost_ADDITIONAL_VERSIONS
-        "1.70"
-        "1.70.0"
-        "1.71"
-        "1.71.0"
-        "1.72"
-        "1.72.0"
-        "1.73"
-        "1.73.0"
-        "1.74"
-        "1.74.0"
+		"1.90.0"
+		"1.90"
 )
 
 IF ( GENEVA_STATIC )
@@ -192,7 +185,7 @@ ELSE () # Dynamic libraries
 ENDIF ()
 
 # The minimum Boost version required for building Geneva and Geneva applications
-SET (GENEVA_MIN_BOOST_VERSION 1.70)
+SET (GENEVA_MIN_BOOST_VERSION 1.90)
 
 # These are the libraries required for any Geneva build
 SET (
@@ -201,7 +194,6 @@ SET (
 	filesystem
 	regex
 	serialization
-	system
 	program_options
 )
 
@@ -238,13 +230,14 @@ MESSAGE("")
 
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 
-# Optionally search for OpenCL
-IF(GENEVA_BUILD_WITH_OPENCL_EXAMPLES)
-    FIND_PACKAGE(OpenCL REQUIRED)
-    MESSAGE("")
-    IF(OpenCL_FOUND)
-        INCLUDE_DIRECTORIES(${OpenCL_INCLUDE_DIRS})
-    ENDIF()
+# Optionally Search for MPI
+IF(GENEVA_BUILD_WITH_MPI_CONSUMER)
+	MESSAGE("Searching for MPI...\n")
+	FIND_PACKAGE(MPI REQUIRED)
+	MESSAGE("")
+	IF(MPI_FOUND)
+		INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+	ENDIF()
 ENDIF()
 
 # Add compile-time debug information about Boost's linked libraries
@@ -444,6 +437,9 @@ IF(NOT CMAKE_CONFIGURATION_TYPES)
 	STRING (REGEX REPLACE "[ \t]+" "\n\t\t\t\t\t " CMAKE_CXX_FLAGS_SEP ${CMAKE_CXX_FLAGS_STRIPPED})
 	MESSAGE ("\twith C++ compiler flags:\t ${CMAKE_CXX_FLAGS_SEP}")
 ENDIF ()
+
+MESSAGE("\tUsing C++ standard ${CMAKE_CXX_STANDARD}")
+
 # Don't print linker options if empty
 STRING (STRIP "${CMAKE_EXE_LINKER_FLAGS}" CMAKE_L_FLAGS_STRIPPED)
 IF(NOT "${CMAKE_L_FLAGS_STRIPPED}" STREQUAL "")
 
@@ -206,25 +206,6 @@ FUNCTION (
 
 ENDFUNCTION()
 
-################################################################################
-# Sets the C++ standard flags for this compiler
-#
-MACRO (
-	SET_CXX_STANDARD_FLAG
-)
-
-	#--------------------------------------------------------------------------
-	# Set the C++-standard switch for our compiler
-	IF (${CMAKE_VERSION} VERSION_LESS 3.1)
-		ADD_COMPILE_OPTIONS("${${CMAKE_CXX_COMPILER_ID}_DEF_CXX${CMAKE_CXX_STANDARD}_STANDARD_FLAG}")
-	ELSE()
-		# Let CMake take care of the C++ standard flag, using CMAKE_CXX_STANDARD
-		SET(CMAKE_CXX_STANDARD_REQUIRED ON)
-	ENDIF()
-	#--------------------------------------------------------------------------
-
-ENDMACRO()
-
 ################################################################################
 # Sets the compiler flags for this platform and compiler
 #
@@ -319,19 +300,30 @@ FUNCTION (
 		# For Clang on MacOSX we require the standard C++ library
 		IF(${GENEVA_OS_NAME_IN} STREQUAL "MacOSX")
 			SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++" PARENT_SCOPE)
-			IF( NOT GENEVA_STATIC )
+			IF(NOT GENEVA_STATIC)
 				SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++" PARENT_SCOPE)
 				SET (MACOSX_RPATH 1)
 			ENDIF()
 		ELSEIF(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.7)
 			# Avoid https://llvm.org/bugs/show_bug.cgi?id=18402
 			# when using older libstdc++ versions
 			SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++" PARENT_SCOPE)
-			IF( NOT GENEVA_STATIC )
+			IF(NOT GENEVA_STATIC)
 				SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++" PARENT_SCOPE)
 			ENDIF()
 		ENDIF()
 
+	#*****************************************************************
+	ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES ${GNU_DEF_IDENTIFIER})
+
+		# For GCC version < 9.0 add the filesystem library explicitely
+		IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 9.0)
+			SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++fs" PARENT_SCOPE)
+			IF(NOT GENEVA_STATIC)
+				SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lstdc++fs" PARENT_SCOPE)
+			ENDIF()
+		ENDIF()
+
 	ENDIF()
 	#--------------------------------------------------------------------------
 
@@ -378,7 +370,7 @@ FUNCTION (
 	#--------------------------------------------------------------------------
 	IF(${GENEVA_OS_NAME_IN} STREQUAL "MacOSX")
 		# Only clang is currently supported on MacOS
-        IF(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL ${CLANG_DEF_IDENTIFIER} AND NOT CMAKE_CXX_COMPILER_ID STREQUAL ${APPLECLANG_DEF_IDENTIFIER})
+		IF(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL ${CLANG_DEF_IDENTIFIER} AND NOT CMAKE_CXX_COMPILER_ID STREQUAL ${APPLECLANG_DEF_IDENTIFIER})
 			MESSAGE("####################################################################################")
 			MESSAGE("# Compiler ${CMAKE_CXX_COMPILER_ID} is not supported on MacOSX. Use Clang instead. #")
 			MESSAGE("####################################################################################")