From e6dcbe3ad4a4857cdf8010879011a5351e425909 Mon Sep 17 00:00:00 2001 From: Panos Syskakis Date: Mon, 30 Oct 2023 07:21:37 -0500 Subject: [PATCH 1/5] Fix test gasnet env variable --- cmake/HPX_AddTest.cmake | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cmake/HPX_AddTest.cmake b/cmake/HPX_AddTest.cmake index 863c003fea9e..fbb6c50b4e84 100644 --- a/cmake/HPX_AddTest.cmake +++ b/cmake/HPX_AddTest.cmake @@ -91,14 +91,8 @@ function(add_hpx_test category name) set(Python_EXECUTABLE ${PYTHON_EXECUTABLE}) endif() - set(ENV_VAR "") - if(HPX_WITH_PARCELPORT_GASNET) - set(ENV_VAR "GASNET_PSHM_NODES=2") - endif() - # cmake-format: off set(cmd - ${ENV_VAR} "${Python_EXECUTABLE}" "${_script_location}/bin/hpxrun.py" ${CMAKE_CROSSCOMPILING_EMULATOR} @@ -179,7 +173,10 @@ function(add_hpx_test category name) add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "lci" "-r" "mpi" ${args} ) - set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE) + set_tests_properties( + "${_full_name}" PROPERTIES RUN_SERIAL TRUE ENVIRONMENT + "GASNET_PSHM_NODES=2" + ) if(${name}_TIMEOUT) set_tests_properties( "${_full_name}" PROPERTIES TIMEOUT ${${name}_TIMEOUT} From 833feac314bbca408b608aa93826f671e79745e5 Mon Sep 17 00:00:00 2001 From: Pansysk75 Date: Tue, 31 Oct 2023 04:41:12 -0500 Subject: [PATCH 2/5] Add check for gasnet runwrapper --- cmake/HPX_AddTest.cmake | 10 +++++----- cmake/HPX_SetupGasnet.cmake | 21 ++++++++++++++++----- cmake/templates/hpxrun.py.in | 2 +- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/cmake/HPX_AddTest.cmake b/cmake/HPX_AddTest.cmake index fbb6c50b4e84..17eb68199651 100644 --- a/cmake/HPX_AddTest.cmake +++ b/cmake/HPX_AddTest.cmake @@ -123,7 +123,7 @@ function(add_hpx_test category name) if(${name}_LOCALITIES STREQUAL "1") set(_full_name "${category}.${name}") - add_test(NAME "${category}.${name}" COMMAND ${cmd} ${args}) + add_test(NAME "${_full_name}" COMMAND ${cmd} ${args}) if(${run_serial}) set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE) endif() @@ -174,9 +174,8 @@ function(add_hpx_test category name) ${args} ) set_tests_properties( - "${_full_name}" PROPERTIES RUN_SERIAL TRUE ENVIRONMENT - "GASNET_PSHM_NODES=2" - ) + "${_full_name}" PROPERTIES RUN_SERIAL TRUE) + if(${name}_TIMEOUT) set_tests_properties( "${_full_name}" PROPERTIES TIMEOUT ${${name}_TIMEOUT} @@ -200,7 +199,8 @@ function(add_hpx_test category name) add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "gasnet" "-r" "gasnet" ${args} ) - set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE) + set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE ENVIRONMENT + "PATH=${PROJECT_BINARY_DIR}/_deps/gasnet-src/install/bin:$ENV{PATH}") if(${name}_TIMEOUT) set_tests_properties( "${_full_name}" PROPERTIES TIMEOUT ${${name}_TIMEOUT} diff --git a/cmake/HPX_SetupGasnet.cmake b/cmake/HPX_SetupGasnet.cmake index 26653ac1d944..fa663a85f753 100644 --- a/cmake/HPX_SetupGasnet.cmake +++ b/cmake/HPX_SetupGasnet.cmake @@ -103,11 +103,22 @@ macro(hpx_setup_gasnet) set(GASNET_BUILD_OUTPUT "${GASNET_DIR}/build.log") set(GASNET_ERROR_FILE "${GASNET_DIR}/error.log") + if(CMAKE_BUILD_PARALLEL_LEVEL) + set(GASNET_BUILD_PARALLEL_LEVEL ${CMAKE_BUILD_PARALLEL_LEVEL}) + else() + cmake_host_system_information(RESULT GASNET_BUILD_PARALLEL_LEVEL + QUERY NUMBER_OF_PHYSICAL_CORES) + endif() + + if (NOT ${GASNET_BUILD_PARALLEL_LEVEL}) + set(GASNET_BUILD_PARALLEL_LEVEL 1) + endif() + if("${HPX_WITH_PARCELPORT_GASNET_CONDUIT}" STREQUAL "udp") execute_process( COMMAND bash -c - "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC --enable-udp && make && make install" + "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC --enable-udp && make -j ${GASNET_BUILD_PARALLEL_LEVEL} && make install" WORKING_DIRECTORY ${GASNET_DIR} RESULT_VARIABLE GASNET_BUILD_STATUS OUTPUT_FILE ${GASNET_BUILD_OUTPUT} @@ -117,7 +128,7 @@ macro(hpx_setup_gasnet) execute_process( COMMAND bash -c - "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC --enable-smp && make && make install" + "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC --enable-smp && make -j ${GASNET_BUILD_PARALLEL_LEVEL} && make install" WORKING_DIRECTORY ${GASNET_DIR} RESULT_VARIABLE GASNET_BUILD_STATUS OUTPUT_FILE ${GASNET_BUILD_OUTPUT} @@ -127,7 +138,7 @@ macro(hpx_setup_gasnet) execute_process( COMMAND bash -c - "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-ofi --with-ofi-home=${OFI_DIR} --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC && make && make install" + "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-ofi --with-ofi-home=${OFI_DIR} --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC && make -j ${GASNET_BUILD_PARALLEL_LEVEL} && make install" WORKING_DIRECTORY ${GASNET_DIR} RESULT_VARIABLE GASNET_BUILD_STATUS OUTPUT_FILE ${GASNET_BUILD_OUTPUT} @@ -137,7 +148,7 @@ macro(hpx_setup_gasnet) execute_process( COMMAND bash -c - "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-ucx --with-ucx-home=${UCX_DIR} --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC && make && make install" + "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-ucx --with-ucx-home=${UCX_DIR} --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC && make -j ${GASNET_BUILD_PARALLEL_LEVEL} && make install" WORKING_DIRECTORY ${GASNET_DIR} RESULT_VARIABLE GASNET_BUILD_STATUS OUTPUT_FILE ${GASNET_BUILD_OUTPUT} @@ -173,7 +184,7 @@ macro(hpx_setup_gasnet) execute_process( COMMAND bash -c - "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-mpi --with-mpi-cc=${CMAKE_C_COMPILER} --with-mpi-libs=${MPI_C_LIBRARIES} --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC && make && make install" + "CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} CFLAGS=-fPIC CCFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-mpi --with-mpi-cc=${CMAKE_C_COMPILER} --with-mpi-libs=${MPI_C_LIBRARIES} --prefix=${GASNET_DIR}/install --with-cflags=-fPIC --with-cxxflags=-fPIC && make -j ${GASNET_BUILD_PARALLEL_LEVEL} && make install" WORKING_DIRECTORY ${GASNET_DIR} RESULT_VARIABLE GASNET_BUILD_STATUS OUTPUT_FILE ${GASNET_BUILD_OUTPUT} diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in index 21a5badbd411..3329dd4b13c8 100755 --- a/cmake/templates/hpxrun.py.in +++ b/cmake/templates/hpxrun.py.in @@ -294,7 +294,7 @@ def check_options(parser, options, args): sys.exit(1) check_valid_runwrapper = (lambda x: - x == 'none' or x == 'mpi' or x == 'srun' or x =='jsrun'); + x == 'none' or x == 'mpi' or x == 'srun' or x =='jsrun' or x == 'gasnet'); if not check_valid_runwrapper(options.runwrapper): print('Error: Runwrapper option not valid\n', sys.stderr) parser.print_help() From b07b2edcd70f415d4e81c3ad5aaed41e2088c703 Mon Sep 17 00:00:00 2001 From: Pansysk75 Date: Thu, 9 Nov 2023 14:00:46 -0600 Subject: [PATCH 3/5] Add gasnet-smp runwrapper to hpxrun.py --- cmake/HPX_AddTest.cmake | 2 +- cmake/templates/hpxrun.py.in | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/cmake/HPX_AddTest.cmake b/cmake/HPX_AddTest.cmake index 17eb68199651..9b99b39b89ad 100644 --- a/cmake/HPX_AddTest.cmake +++ b/cmake/HPX_AddTest.cmake @@ -197,7 +197,7 @@ function(add_hpx_test category name) if(_add_test) set(_full_name "${category}.distributed.gasnet.${name}") add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "gasnet" "-r" - "gasnet" ${args} + "gasnet-smp" ${args} ) set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE ENVIRONMENT "PATH=${PROJECT_BINARY_DIR}/_deps/gasnet-src/install/bin:$ENV{PATH}") diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in index 3329dd4b13c8..3bc50eacd078 100755 --- a/cmake/templates/hpxrun.py.in +++ b/cmake/templates/hpxrun.py.in @@ -195,13 +195,19 @@ def run_mpi(cmd, localities, verbose): print('Executing command: ' + ' '.join(exec_cmd)) subproc(exec_cmd) -# Run with amudprun -# This is executing amudprun with the "-np" option set to the number of localities def run_gasnet(cmd, localities, verbose): - exec_cmd = ['amudprun', '-np', str(localities)] + cmd - if verbose: - print('Executing command: ' + ' '.join(exec_cmd)) - subproc(exec_cmd) + os.environ['GASNET_PSHM_NODES'] = str(localities) + os.environ['GASNET_QUIET'] = 'yes' + os.environ['GASNET_ROUTE_OUTPUT'] = '0' + run_mpi(cmd, localities, verbose) + +def run_gasnet_smp(cmd, localities, verbose): + os.environ['GASNET_PSHM_NODES'] = str(localities) + os.environ['GASNET_BARRIER'] = 'PSHM' + os.environ['GASNET_QUIET'] = 'yes' + os.environ['GASNET_ROUTE_OUTPUT'] = '0' + # No launcher needed + run_none(cmd, localities, nodes, verbose) # Run with srun # This is executing srun with the '-n' option set to the number of localities @@ -229,6 +235,9 @@ def run(cmd, runwrapper, localities, nodes, verbose): if runwrapper == 'gasnet': assert nodes is None, "nodes option only valid with tcp parcelport." run_gasnet(cmd, localities, verbose) + if runwrapper == 'gasnet-smp': + assert nodes is None, "nodes option only valid with smp parcelport." + run_gasnet_smp(cmd, localities, verbose) if runwrapper == 'srun': assert nodes is None, "nodes option only valid with tcp parcelport." run_srun(cmd, localities, verbose) @@ -294,7 +303,7 @@ def check_options(parser, options, args): sys.exit(1) check_valid_runwrapper = (lambda x: - x == 'none' or x == 'mpi' or x == 'srun' or x =='jsrun' or x == 'gasnet'); + x == 'none' or x == 'mpi' or x == 'srun' or x =='jsrun' or x == 'gasnet' or x == 'gasnet-smp'); if not check_valid_runwrapper(options.runwrapper): print('Error: Runwrapper option not valid\n', sys.stderr) parser.print_help() @@ -379,7 +388,7 @@ Used by the tcp parcelport only. parser.add_option('-r', '--runwrapper' , action='store', type='string' , dest='runwrapper', default=default_env('HPXRUN_RUNWRAPPER', 'none') - , help='Which runwrapper to use (Options are: none, mpi, gasnet, srun, jsrun) ' + , help='Which runwrapper to use (Options are: none, mpi, gasnet, gasnet-smp, srun, jsrun) ' '(environment variable HPXRUN_RUNWRAPPER)') parser.add_option('-e', '--expected' From 91aa891a5ec1ef7a99b4e6999fe358e570954187 Mon Sep 17 00:00:00 2001 From: Pansysk75 Date: Thu, 9 Nov 2023 17:01:28 -0600 Subject: [PATCH 4/5] Fix priority in gasnet config --- libs/core/gasnet_base/src/gasnet_environment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/core/gasnet_base/src/gasnet_environment.cpp b/libs/core/gasnet_base/src/gasnet_environment.cpp index 5c09db35185a..a61a1ad999c9 100644 --- a/libs/core/gasnet_base/src/gasnet_environment.cpp +++ b/libs/core/gasnet_base/src/gasnet_environment.cpp @@ -263,8 +263,8 @@ namespace hpx::util { (get_entry_as(cfg, "hpx.parcel.tcp.priority", 1) > get_entry_as(cfg, "hpx.parcel.gasnet.priority", 0))) || (get_entry_as(cfg, "hpx.parcel.gasnet.enable", 1) && - (get_entry_as(cfg, "hpx.parcel.gasnet.priority", 1) > - get_entry_as(cfg, "hpx.parcel.mpi.priority", 0)))) + (get_entry_as(cfg, "hpx.parcel.mpi.priority", 1) > + get_entry_as(cfg, "hpx.parcel.gasnet.priority", 0)))) { LBT_(info) << "GASNET support disabled via configuration settings\n"; From e098bb01ecfa9a37b7bd9b2e393a16dc294a571f Mon Sep 17 00:00:00 2001 From: Pansysk75 Date: Thu, 9 Nov 2023 17:35:08 -0600 Subject: [PATCH 5/5] Remove gasnet from test configuration --- .jenkins/lsu/env-clang-12.sh | 3 --- .jenkins/lsu/env-clang-13.sh | 3 --- .jenkins/lsu/env-clang-14.sh | 3 --- .jenkins/lsu/env-clang-15.sh | 3 --- .jenkins/lsu/env-clang-16.sh | 3 --- .jenkins/lsu/env-clang-17.sh | 3 --- .jenkins/lsu/env-gcc-10.sh | 3 --- .jenkins/lsu/env-gcc-12.sh | 3 --- .jenkins/lsu/env-gcc-13.sh | 3 --- cmake/HPX_AddTest.cmake | 13 ++++++++----- cmake/HPX_SetupGasnet.cmake | 7 ++++--- 11 files changed, 12 insertions(+), 35 deletions(-) diff --git a/.jenkins/lsu/env-clang-12.sh b/.jenkins/lsu/env-clang-12.sh index 15e920431f54..c9b5e4a5ee10 100644 --- a/.jenkins/lsu/env-clang-12.sh +++ b/.jenkins/lsu/env-clang-12.sh @@ -25,11 +25,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=clang" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_LOGGING=OFF" # The pwrapi library still needs to be set up properly on rostam diff --git a/.jenkins/lsu/env-clang-13.sh b/.jenkins/lsu/env-clang-13.sh index 4582dd0dba9f..76df09cfd93b 100644 --- a/.jenkins/lsu/env-clang-13.sh +++ b/.jenkins/lsu/env-clang-13.sh @@ -25,11 +25,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=clang" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_LOGGING=OFF" configure_extra_options+=" -DHPX_WITH_TESTS_COMMAND_LINE=--hpx:queuing=local-workrequesting-fifo" diff --git a/.jenkins/lsu/env-clang-14.sh b/.jenkins/lsu/env-clang-14.sh index 5a52f3c2dca5..144c17e7820d 100644 --- a/.jenkins/lsu/env-clang-14.sh +++ b/.jenkins/lsu/env-clang-14.sh @@ -25,11 +25,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=clang" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_LOGGING=OFF" configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE" configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON" diff --git a/.jenkins/lsu/env-clang-15.sh b/.jenkins/lsu/env-clang-15.sh index b92c378bd2ce..1df2a9fd23b3 100644 --- a/.jenkins/lsu/env-clang-15.sh +++ b/.jenkins/lsu/env-clang-15.sh @@ -25,11 +25,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=clang" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_LOGGING=OFF" configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE" configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON" diff --git a/.jenkins/lsu/env-clang-16.sh b/.jenkins/lsu/env-clang-16.sh index c1cf84333a6d..393e42c03e54 100644 --- a/.jenkins/lsu/env-clang-16.sh +++ b/.jenkins/lsu/env-clang-16.sh @@ -25,11 +25,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=clang" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_LOGGING=OFF" configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE" configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON" diff --git a/.jenkins/lsu/env-clang-17.sh b/.jenkins/lsu/env-clang-17.sh index fc0a9d8eee59..1b6ac8d26294 100644 --- a/.jenkins/lsu/env-clang-17.sh +++ b/.jenkins/lsu/env-clang-17.sh @@ -25,11 +25,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=clang" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_LOGGING=OFF" configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE" configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON" diff --git a/.jenkins/lsu/env-gcc-10.sh b/.jenkins/lsu/env-gcc-10.sh index 3953fae9420a..9c4064825a0a 100644 --- a/.jenkins/lsu/env-gcc-10.sh +++ b/.jenkins/lsu/env-gcc-10.sh @@ -25,11 +25,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=gcc" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" # The pwrapi library still needs to be set up properly on rostam # configure_extra_options+=" -DHPX_WITH_POWER_COUNTER=ON" diff --git a/.jenkins/lsu/env-gcc-12.sh b/.jenkins/lsu/env-gcc-12.sh index 80b5c4a9df10..48a6887c1ba6 100644 --- a/.jenkins/lsu/env-gcc-12.sh +++ b/.jenkins/lsu/env-gcc-12.sh @@ -24,11 +24,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=gcc" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE" configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON" configure_extra_options+=" -DHPX_WITH_EVE_TAG=main" diff --git a/.jenkins/lsu/env-gcc-13.sh b/.jenkins/lsu/env-gcc-13.sh index 032c33b297a7..4a10458aa535 100644 --- a/.jenkins/lsu/env-gcc-13.sh +++ b/.jenkins/lsu/env-gcc-13.sh @@ -24,11 +24,8 @@ configure_extra_options+=" -DHPX_WITH_COMPILER_WARNINGS_AS_ERRORS=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_MPI=ON" configure_extra_options+=" -DHPX_WITH_PARCELPORT_LCI=ON" configure_extra_options+=" -DHPX_WITH_FETCH_LCI=ON" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET=ON" -configure_extra_options+=" -DHPX_WITH_FETCH_GASNET=ON" configure_extra_options+=" -DCMAKE_C_COMPILER=gcc" configure_extra_options+=" -DCMAKE_C_FLAGS=-fPIC" -configure_extra_options+=" -DHPX_WITH_PARCELPORT_GASNET_CONDUIT=smp" configure_extra_options+=" -DHPX_WITH_DATAPAR_BACKEND=EVE" configure_extra_options+=" -DHPX_WITH_FETCH_EVE=ON" configure_extra_options+=" -DHPX_WITH_EVE_TAG=main" diff --git a/cmake/HPX_AddTest.cmake b/cmake/HPX_AddTest.cmake index 9b99b39b89ad..cd90dc0d0972 100644 --- a/cmake/HPX_AddTest.cmake +++ b/cmake/HPX_AddTest.cmake @@ -173,9 +173,8 @@ function(add_hpx_test category name) add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "lci" "-r" "mpi" ${args} ) - set_tests_properties( - "${_full_name}" PROPERTIES RUN_SERIAL TRUE) - + set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE) + if(${name}_TIMEOUT) set_tests_properties( "${_full_name}" PROPERTIES TIMEOUT ${${name}_TIMEOUT} @@ -199,8 +198,12 @@ function(add_hpx_test category name) add_test(NAME "${_full_name}" COMMAND ${cmd} "-p" "gasnet" "-r" "gasnet-smp" ${args} ) - set_tests_properties("${_full_name}" PROPERTIES RUN_SERIAL TRUE ENVIRONMENT - "PATH=${PROJECT_BINARY_DIR}/_deps/gasnet-src/install/bin:$ENV{PATH}") + set_tests_properties( + "${_full_name}" + PROPERTIES + RUN_SERIAL TRUE ENVIRONMENT + "PATH=${PROJECT_BINARY_DIR}/_deps/gasnet-src/install/bin:$ENV{PATH}" + ) if(${name}_TIMEOUT) set_tests_properties( "${_full_name}" PROPERTIES TIMEOUT ${${name}_TIMEOUT} diff --git a/cmake/HPX_SetupGasnet.cmake b/cmake/HPX_SetupGasnet.cmake index fa663a85f753..61690c08ddae 100644 --- a/cmake/HPX_SetupGasnet.cmake +++ b/cmake/HPX_SetupGasnet.cmake @@ -106,11 +106,12 @@ macro(hpx_setup_gasnet) if(CMAKE_BUILD_PARALLEL_LEVEL) set(GASNET_BUILD_PARALLEL_LEVEL ${CMAKE_BUILD_PARALLEL_LEVEL}) else() - cmake_host_system_information(RESULT GASNET_BUILD_PARALLEL_LEVEL - QUERY NUMBER_OF_PHYSICAL_CORES) + cmake_host_system_information( + RESULT GASNET_BUILD_PARALLEL_LEVEL QUERY NUMBER_OF_PHYSICAL_CORES + ) endif() - if (NOT ${GASNET_BUILD_PARALLEL_LEVEL}) + if(NOT ${GASNET_BUILD_PARALLEL_LEVEL}) set(GASNET_BUILD_PARALLEL_LEVEL 1) endif()