Skip to content

Commit

Permalink
Merge pull request #1850 from McStasMcXtrace/config-fixes-openacc
Browse files Browse the repository at this point in the history 
Config fixes openacc
  • Loading branch information
@willend
willend authored Feb 11, 2025
2 parents 04da981 + 40adf34 commit f8edc53
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion cmake/Modules/PlatformDefaults.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function( detect_platform_variables resultvarname )
#MPI / OACC variables (don't attempt to detect, just expose here so it is
#clear how to change them at the CMake cfg level):

set(OACCFLAGS "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC")
set(OACCFLAGS "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC")
provide_var( OACCFLAGS )
set(OACC "nvc")
provide_var( OACC )
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mccodelib/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"MPIFLAGS": "-DUSE_MPI -lmpi",
"GSLFLAGS": "-lgsl",
"XRLFLAGS": "",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "gcc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcstas-test/McStas_3GPU/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC -DUSE_MPI -lmpi -I/usr/lib/x86_64-linux-gnu/openmpi/include/ -L/usr/lib/x86_64-linux-gnu/openmpi/lib/",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC -DUSE_MPI -lmpi -I/usr/lib/x86_64-linux-gnu/openmpi/include/ -L/usr/lib/x86_64-linux-gnu/openmpi/lib/",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi -I/usr/lib/x86_64-linux-gnu/openmpi/include/ -L/usr/lib/x86_64-linux-gnu/openmpi/lib/",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "gcc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mctest/mcstas-test/McStas_8GPU/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"CFLAGS": "-g -lm -O2 -std=c99",
"NEXUSFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -DUSE_NEXUS -lNeXus -IGETPATH(miniconda3/include/nexus)",
"MPIFLAGS": "-DUSE_MPI -lmpi -Wl,-rpath,/opt/nvidia/hpc_sdk/Linux_x86_64/25.1/comm_libs/12.6/openmpi4/openmpi-4.1.5/lib -L,/opt/nvidia/hpc_sdk/Linux_x86_64/25.1/comm_libs/12.6/openmpi4/openmpi-4.1.5/lib -I/opt/nvidia/hpc_sdk/Linux_x86_64/25.1/comm_libs/12.6/openmpi4/openmpi-4.1.5/include",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"GSLFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -lgsl -lgslcblas -IGETPATH(miniconda3/include)",
"XRLFLAGS": "",
"CC": "gcc",
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mctest/mcstas-test/McStas_CPU_GCC_KISS/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"CFLAGS": "-g -lm -std=c99 -D_POSIX_SOURCE -O2 -DRNG_ALG=2",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "gcc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mctest/mcstas-test/McStas_CPU_GCC_MT/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"CFLAGS": "-g -lm -std=c99 -D_POSIX_SOURCE -O2",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "gcc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mctest/mcstas-test/McStas_CPU_MPICC_KISS/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"CFLAGS": "-g -lm -O2 -DUSE_MPI -lmpi -std=c99 -D_POSIX_SOURCE",
"NEXUSFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -DUSE_NEXUS -lNeXus -IGETPATH(miniconda3/include/nexus)",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"GSLFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -lgsl -lgslcblas -IGETPATH(miniconda3/include/)",
"XRLFLAGS": "",
"CC": "mpicc",
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mctest/mcstas-test/McStas_CPU_MPICC_MT/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"CFLAGS": "-g -lm -O2 -DUSE_MPI -lmpi -DRNG_ALG=1",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "mpicc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcstas-test/McStas_GPU_A100_PGCC_TESLA_KISS/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -Minfo=accel -DOPENACC",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -Minfo=accel -DOPENACC",
"NEXUSFLAGS": "-Wl,-rpath,GETPATH(lib) -LGETPATH(lib) -DUSE_NEXUS -lNeXus -IGETPATH(include/nexus)",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "nvc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcstas-test/McStas_GPU_PGCC_TESLA_KISS/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -Minfo=accel -DOPENACC",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -Minfo=accel -DOPENACC",
"NEXUSFLAGS": "-Wl,-rpath,GETPATH(lib) -LGETPATH(lib) -DUSE_NEXUS -lNeXus -IGETPATH(include/nexus)",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "nvc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcstas-test/McStas_GPU_PGCC_TESLA_KISS_FUNNEL/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -Minfo=accel -DOPENACC -DFUNNEL",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -Minfo=accel -DOPENACC -DFUNNEL",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC -DFUNNEL",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC -DFUNNEL",
"CC": "nvc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcstas-test/McStas_GPU_PGCC_TESLA_KISS_NOSPLIT/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -Minfo=accel -DOPENACC -DNOSPLIT",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -Minfo=accel -DOPENACC -DNOSPLIT",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "nvc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcstas-test/McStas_multiGPU_PGCC_TESLA_KISS/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -Minfo=accel -DOPENACC -DUSE_MPI -lmpi",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -Minfo=accel -DOPENACC -DUSE_MPI -lmpi",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "nvc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
2 changes: 1 addition & 1 deletion tools/Python/mctest/mcxtrace-test/McXtrace_8GPU/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"CFLAGS": "-g -lm -O2 -std=c99",
"NEXUSFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -DUSE_NEXUS -lNeXus -IGETPATH(miniconda3/include/nexus)",
"MPIFLAGS": "-DUSE_MPI -lmpi -Wl,-rpath,/opt/nvidia/hpc_sdk/Linux_x86_64/25.1/comm_libs/12.6/openmpi4/openmpi-4.1.5/lib -L,/opt/nvidia/hpc_sdk/Linux_x86_64/25.1/comm_libs/12.6/openmpi4/openmpi-4.1.5/lib -I/opt/nvidia/hpc_sdk/Linux_x86_64/25.1/comm_libs/12.6/openmpi4/openmpi-4.1.5/include",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"GSLFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -lgsl -lgslcblas -IGETPATH(miniconda3/include)",
"XRLFLAGS": "-Wl,-rpath,GETPATH(miniconda3/lib) -LGETPATH(miniconda3/lib) -lxrl -IGETPATH(miniconda3/include)",
"CC": "gcc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcxtrace-test/McXtrace_GPU_PGCC_TESLA_KISS/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -Minfo=accel -DOPENACC",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -Minfo=accel -DOPENACC",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC",
"CC": "nvc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down
4 changes: 2 additions & 2 deletions tools/Python/mctest/mcxtrace-test/McXtrace_GPU_PGCC_TESLA_KISS_FUNNEL/mccode_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"ISCONDAPKG": "0"
},
"compilation": {
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -Minfo=accel -DOPENACC -DFUNNEL",
"CFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -Minfo=accel -DOPENACC -DFUNNEL",
"NEXUSFLAGS": "-DUSE_NEXUS -lNeXus",
"MPIFLAGS": "-DUSE_MPI -lmpi",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=managed -DOPENACC -DFUNNEL",
"OACCFLAGS": "-fast -Minfo=accel -acc=gpu -gpu=mem:managed -DOPENACC -DFUNNEL",
"CC": "nvc",
"OACC": "nvc",
"MPICC": "mpicc",
Expand Down

0 comments on commit f8edc53

Please sign in to comment.