Skip to content

Commit f08375f

Browse files
zbeekmanzbeekman
authored
Merge pull request #791 from sourceryinstitute/vehre/issue-654-send_by_ref_for_rank_2
Fix send_by_ref by modelling it like get_by_ref.
2 parents 484392c + f8988a0 commit f08375f

File tree

10 files changed

+300
-162
lines changed

10 files changed

+300
-162
lines changed

‎.github/workflows/ci.yml ‎.github/workflows/ci-ubuntu-22.04.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
name: CI
1+
name: Ubuntu 22.04 CI
22

33
on: push
44

55
jobs:
66
Build:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04
88
strategy:
99
fail-fast: true
10+
matrix:
11+
mpi: [ 'mpich', 'impi' ]
12+
# mpi: [ 'mpich', 'openmpi', 'impi' ]
13+
# openmpi is borken on ubuntu-22.04 and above see https://github.com/open-mpi/ompi/issues/10726
1014

1115
env:
1216
FC: gfortran
@@ -18,15 +22,22 @@ jobs:
1822

1923
- name: Install Dependencies
2024
run: |
21-
sudo apt install -y gfortran-${GCC_V} cmake mpich
25+
sudo apt install -y gfortran-${GCC_V} cmake
2226
sudo update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} 100
2327
28+
- name: Setup MPI ${{ matrix.mpi }}
29+
uses: mpi4py/setup-mpi@v1
30+
with:
31+
mpi: ${{ matrix.mpi }}
32+
2433
- name: Build and Test
2534
run: |
35+
mpirun --version
2636
mkdir build
2737
cmake -S . -B build -Wdev -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug" ..
2838
cmake --build build -j $(nproc)
2939
cmake --build build -t install -j $(nproc) || echo "installation failed"
3040
ctest --test-dir build --output-on-failure --schedule-random --repeat-until-fail 1 --timeout 200
3141
cd build
3242
make uninstall
43+
echo "Ran with mpi: ${{ matrix.mpi }}"

‎.github/workflows/ci-ubuntu-latest.yml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Ubuntu latest CI
2+
3+
on: push
4+
5+
jobs:
6+
Build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
fail-fast: true
10+
matrix:
11+
mpi: [ 'impi' ]
12+
# mpi: [ 'mpich', 'openmpi', 'impi' ]
13+
# mpich is borken on ubuntu-24.04LTS and 24.10 see https://bugs.launchpad.net/ubuntu/+source/mpich/+bug/2072338
14+
# openmpi is borken on ubuntu-24.04LTS and 24.10 see https://github.com/open-mpi/ompi/issues/10726
15+
# ubuntu 24.10 is not available as github runner, so we are left with Intel's mpi for now.
16+
17+
env:
18+
FC: gfortran
19+
GCC_V: 13
20+
21+
steps:
22+
- name: Checkout code
23+
uses: actions/checkout@v3
24+
25+
- name: Install Dependencies
26+
run: |
27+
sudo apt install -y gfortran-${GCC_V} cmake
28+
sudo update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} 100
29+
30+
- name: Setup MPI ${{ matrix.mpi }}
31+
uses: mpi4py/setup-mpi@v1
32+
with:
33+
mpi: ${{ matrix.mpi }}
34+
35+
- name: Build and Test
36+
run: |
37+
mpirun --version
38+
mkdir build
39+
cmake -S . -B build -Wdev -DCMAKE_INSTALL_PREFIX:PATH="${HOME}/OpenCoarrays" -DCMAKE_BUILD_TYPE:STRING="Debug" ..
40+
cmake --build build -j $(nproc)
41+
cmake --build build -t install -j $(nproc) || echo "installation failed"
42+
ctest --test-dir build --output-on-failure --schedule-random --repeat-until-fail 1 --timeout 200
43+
cd build
44+
make uninstall
45+
echo "Ran with mpi: ${{ matrix.mpi }}"

‎.github/workflows/win-ci.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,23 @@ jobs:
4242
ls "${I_MPI_ROOT}/bin"
4343
ls "${I_MPI_ROOT}"
4444
ls "${I_MPI_ROOT}/lib"
45-
mpifc.bat -show
46-
mpicc.bat -show
45+
ls "${I_MPI_ROOT}/env"
46+
# cat "${I_MPI_ROOT}/bin/mpifc.bat"
47+
# mpifc.bat -show
48+
# mpicc.bat -show
4749
mpifc.bat -version || echo "ifort not installed"
4850
mpicc.bat -version || echo "icc not installed"
4951
set +o verbose
52+
# echo The following environment variables are used:
53+
# echo CMPLR_ROOT Intel^(R^) Compiler installation directory path
54+
# echo I_MPI_ROOT Intel^(R^) MPI Library installation directory path
55+
# echo I_MPI_{FC,F77,F90} or MPICH_{FC,F77,F90}
56+
# echo the path/name of the underlying compiler to be used.
57+
# echo I_MPI_{FC,F77,F90}_PROFILE or MPI{FC,F77,F90}_PROFILE
58+
# echo name of profile file ^(without extension^)
59+
# echo I_MPI_COMPILER_CONFIG_DIR
60+
# echo folder which contains configuration files *.conf
61+
# echo VT_ROOT Intel^(R^) Trace Collector installation directory path
5062
5163
- name: Build and Test
5264
run: |

‎CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -734,10 +734,11 @@ function(add_caf_test name num_caf_img test_target)
734734
endif()
735735
# Add a host file for OMPI
736736
get_property(openmpi GLOBAL PROPERTY openmpi)
737+
get_property(N_CPU GLOBAL PROPERTY N_CPU)
737738
if ( openmpi )
738739
set(test_parameters --hostfile ${CMAKE_BINARY_DIR}/hostfile)
739740
endif()
740-
if ( ((N_CPU LESS num_caf_img) OR (N_CPU EQUAL 0)) )
741+
if ( ( N_CPU LESS_EQUAL num_caf_img ) OR ( N_CPU EQUAL 0 ) )
741742
message(STATUS "Test ${name} is oversubscribed: ${num_caf_img} CAF images requested with ${N_CPU} system processor available.")
742743
if ( openmpi )
743744
if (min_test_imgs)
@@ -950,6 +951,8 @@ if(opencoarrays_aware_compiler)
950951
add_caf_test(issue-700-allow-multiple-scalar-dim-array-gets 2 issue-700-allow-multiple-scalar-dim-array-gets)
951952
add_caf_test(issue-762-mpi-crashing-on-exit 2 issue-762-mpi-crashing-on-exit)
952953

954+
add_caf_test(issue-654-send_by_ref_rank_2 3 issue-654-send_by_ref_rank_2)
955+
953956
# IMAGE FAIL tests
954957
if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
955958
if(CAF_ENABLE_FAILED_IMAGES)

‎cmake/uninstall.cmake.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ endforeach()
1717
foreach(file ${files})
1818
message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
1919
if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
20-
exec_program(
21-
"@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
20+
execute_process(
21+
COMMAND "@CMAKE_COMMAND@" -E remove \"$ENV{DESTDIR}${file}\"
2222
OUTPUT_VARIABLE rm_out
23-
RETURN_VALUE rm_retval
23+
RESULT_VARIABLE rm_retval
2424
)
2525
if(NOT "${rm_retval}" STREQUAL 0)
2626
message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")

‎src/runtime-libraries/mpi/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ install(TARGETS opencoarrays_mod caf_mpi caf_mpi_static EXPORT OpenCoarraysTarge
140140
# Determine if we're using Open MPI
141141
#----------------------------------
142142
cmake_host_system_information(RESULT N_CPU QUERY NUMBER_OF_LOGICAL_CORES)
143-
set(N_CPU ${N_CPU} PARENT_SCOPE)
143+
set_property(GLOBAL PROPERTY N_CPU ${N_CPU})
144144
cmake_host_system_information(RESULT HOST_NAME QUERY HOSTNAME)
145145
set(HOST_NAME ${HOST_NAME} PARENT_SCOPE)
146146
execute_process(COMMAND ${MPIEXEC_EXECUTABLE} --version

0 commit comments

Comments
 (0)