Skip to content

Commit bf22fa9

Browse files
committed
load spakc environnement with kokkos
1 parent 64d5929 commit bf22fa9

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
-
4848
name: Build
4949
run: |
50-
spack load kokkos
50+
spacktivate feelpp-openmpi4-kokkos
5151
cmake --preset default
5252
cmake --build --preset default
5353
-

docs/modules/kokkos/examples/src/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
cmake_minimum_required(VERSION 3.10)
22

3-
project(KokkosExample)
43

54
option(FEELPP_ENABLE_KOKKOS "Enable Kokkos support" ON)
65
set(Kokkos_ENABLE_OPENMP ON )

src/MPI/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#project(MPI_bcast)
33

4-
######## A simple cmakelists.txt file for ... #############
4+
######## A simple cmakelists.txt file for ... #############
55

66
cmake_minimum_required(VERSION 3.17)
77
#set(CMAKE_CXX_STANDARD 14)
@@ -60,4 +60,4 @@ foreach (myfile ${WFOPenMP_SRC})
6060
#endif()
6161
endforeach (file ${WFOPenMP_SRC})
6262

63-
########### end ####################################
63+
########### end ####################################

src/MPI/MPI_Philosophers.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#define NUM_MESSAGES 3*NUM_PHILOSOPHERS*NUM_DINNERS
66

7-
const int NUM_DINNERS;
8-
const int NUM_PHILOSOPHERS;
7+
int NUM_DINNERS;
8+
int NUM_PHILOSOPHERS;
99
const int NEED_LEFT_CHOPSTICK = 0;
1010
const int NEED_RIGHT_CHOPSTICK = 1;
1111
const int RELEASE_CHOPSTICKS = 2;
@@ -16,7 +16,7 @@ void philosopher(int rank)
1616
int leftChopstick;
1717
int rightChopstick;
1818
int dummy;
19-
19+
2020
if(rank == NUM_PHILOSOPHERS)
2121
{
2222

@@ -46,7 +46,7 @@ void philosopher(int rank)
4646
printf("Philosopher %d is eating meal %d.\n", rank, i);
4747

4848
MPI_Send(&dummy, 1, MPI_INT, 0, RELEASE_CHOPSTICKS, MPI_COMM_WORLD);
49-
}
49+
}
5050
}
5151

5252
void server()
@@ -221,7 +221,7 @@ int main(int argc, char ** argv)
221221

222222
if(argc != 3)
223223
exit(0);
224-
224+
225225
sscanf(argv[1], "%d", &NUM_PHILOSOPHERS);
226226
printf("The number of philosophers is %d\n", NUM_PHILOSOPHERS);
227227
sscanf(argv[2], "%d", &NUM_DINNERS);

0 commit comments

Comments
 (0)