Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make nvToolsExt conditional on WITH_CUDA_PROFILING #428

Merged
merged 7 commits into from
Feb 8, 2021
Merged

Make nvToolsExt conditional on WITH_CUDA_PROFILING #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a14e7b1
Make nvToolsExt conditional on WITH_CUDA_PROFILING
haampie Feb 5, 2021
a6fa6a8
no need for these flags on mc partition w/o calls to srun
haampie Feb 5, 2021
d317ff2
Use --hint=nomultithread and work around --exclusive bug
haampie Feb 5, 2021
4081e8d
make mkdir consistent with other test.sh files
haampie Feb 5, 2021
34e0283
Bring back -Werror in Release
haampie Feb 5, 2021
5f75549
Revert "no need for these flags on mc partition w/o calls to srun"
haampie Feb 5, 2021
9e210b6
Make the build flags similar to the run flags again
haampie Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .ci/daint.cscs.ch/cray.build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="mc"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand Down
3 changes: 1 addition & 2 deletions .ci/daint.cscs.ch/cray.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="gpu"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand Down
3 changes: 1 addition & 2 deletions .ci/daint.cscs.ch/gnu.build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="mc"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand Down
3 changes: 1 addition & 2 deletions .ci/daint.cscs.ch/gnu.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="gpu"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand Down
3 changes: 1 addition & 2 deletions .ci/daint.cscs.ch/intel.build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="mc"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand Down
3 changes: 1 addition & 2 deletions .ci/daint.cscs.ch/intel.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="gpu"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand Down
3 changes: 1 addition & 2 deletions .ci/daint.cscs.ch/ocl.build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="mc"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand Down
6 changes: 2 additions & 4 deletions .ci/daint.cscs.ch/ocl.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash -l

#SBATCH --export=ALL
#SBATCH --exclusive
#SBATCH --constraint="gpu"
#SBATCH --partition="cscsci"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=4
#SBATCH --cpus-per-task=3
#SBATCH --ntasks-per-core=1 # 1=no HT, 2=HT
#SBATCH --hint=nomultithread

set -o errexit
set -o nounset
Expand All @@ -22,8 +21,7 @@ set -o xtrace # do not set earlier to avoid noise from module

umask 0002 # make sure group members can access the data

mkdir -p "${SCRATCH}/${BUILD_TAG}.ocl"
chmod 0775 "${SCRATCH}/${BUILD_TAG}.ocl"
mkdir --mode=0775 -p "${SCRATCH}/${BUILD_TAG}.ocl"
cd "${SCRATCH}/${BUILD_TAG}.ocl"

export CRAY_CUDA_MPS=1 # enable the CUDA proxy for MPI+CUDA
Expand Down
2 changes: 1 addition & 1 deletion cmake/CompilerConfiguration.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Please open an issue at https://github.com/cp2k/dbcsr/issues with the reported c
endif ()

if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -funroll-loops -Wall")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -funroll-loops -Wall -Werror")
set(CMAKE_CXX_FLAGS_COVERAGE "-O0 -g --coverage -Wall -Werror")
set(CMAKE_CXX_FLAGS_DEBUG "-O2 -ggdb -Wall -Werror -fsanitize=undefined -fsanitize=address -fsanitize-recover=all")
if ((NOT (USE_MPI)) OR (NOT ("${MPI_Fortran_LIBRARY_VERSION_STRING}" MATCHES "Open MPI")))
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ if (USE_ACCEL)
dbcsr
PRIVATE $<$<STREQUAL:${USE_ACCEL},cuda>:CUDA::cudart>
$<$<STREQUAL:${USE_ACCEL},cuda>:CUDA::cublas>
$<$<STREQUAL:${USE_ACCEL},cuda>:CUDA::nvToolsExt>
$<$<STREQUAL:${USE_ACCEL},cuda>:CUDA::nvrtc>
$<$<BOOL:${WITH_CUDA_PROFILING}>:CUDA::nvToolsExt>
$<$<STREQUAL:${USE_ACCEL},hip>:roc::hipblas>
$<$<STREQUAL:${USE_ACCEL},hip>:hip::host>
$<$<STREQUAL:${USE_ACCEL},opencl>:OpenCL::OpenCL>)
Expand Down