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

Enable CUDA 11.5 on CI when testing oldest-newest CUDA versions #716

Merged
merged 2 commits into from
Oct 22, 2021
Merged

Enable CUDA 11.5 on CI when testing oldest-newest CUDA versions #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f83ae57
Enable CUDA 11.5 on CI when testing oldest-newest CUDA versions
ptheywood Oct 21, 2021
4077cd3
Use nv_diag_* instead of diag_* pragmas if supported (CUDA 11.5+)
ptheywood Oct 21, 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
2 changes: 2 additions & 0 deletions .github/scripts/install_cuda_windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ $CUDA_KNOWN_URLS = @{
"11.3.1" = "https://developer.download.nvidia.com/compute/cuda/11.3.1/network_installers/cuda_11.3.1_win10_network.exe"
"11.4.0" = "https://developer.download.nvidia.com/compute/cuda/11.4.0/network_installers/cuda_11.4.0_win10_network.exe"
"11.4.1" = "https://developer.download.nvidia.com/compute/cuda/11.4.1/network_installers/cuda_11.4.1_win10_network.exe"
"11.4.2" = "https://developer.download.nvidia.com/compute/cuda/11.4.1/network_installers/cuda_11.4.1_win10_network.exe"
"11.5.0" = "https://developer.download.nvidia.com/compute/cuda/11.5.0/network_installers/cuda_11.5.0_win10_network.exe"
}

# @todo - change this to be based on _MSC_VER intead, or invert it to be CUDA keyed instead?
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Draft-Release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
matrix:
# CUDA_ARCH values are reduced compared to wheels due to CI memory issues while compiling the test suite.
cudacxx:
- cuda: "11.4"
- cuda: "11.5"
cuda_arch: "35 60 80"
hostcxx: gcc-9
os: ubuntu-20.04
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
matrix:
# CUDA_ARCH values are reduced compared to wheels due to CI memory issues while compiling the test suite.
cudacxx:
- cuda: "11.4.1"
- cuda: "11.5.0"
cuda_arch: "35 60 80"
hostcxx: "Visual Studio 16 2019"
os: windows-2019
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
# optional exclude: can be partial, include: must be specific
matrix:
cudacxx:
- cuda: "11.4"
- cuda: "11.5"
os: ubuntu-20.04
env:
# Define constants
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# optional exclude: can be partial, include: must be specific
matrix:
cudacxx:
- cuda: "11.4"
- cuda: "11.5"
cuda_arch: "35"
hostcxx: gcc-9
os: ubuntu-20.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# optional exclude: can be partial, include: must be specific
matrix:
cudacxx:
- cuda: "11.4.1"
- cuda: "11.5.0"
cuda_arch: "35"
hostcxx: "Visual Studio 16 2019"
os: windows-2019
Expand Down
6 changes: 5 additions & 1 deletion include/flamegpu/flamegpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@

#ifdef USE_GLM
#ifdef __CUDACC__
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diag_suppress = esa_on_defaulted_function_ignored
#else
#pragma diag_suppress = esa_on_defaulted_function_ignored
#endif
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#endif // __CUDACC__
#include <glm/glm.hpp>
#endif

Expand Down
8 changes: 6 additions & 2 deletions include/flamegpu/runtime/DeviceAPI.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@

#ifdef USE_GLM
#ifdef __CUDACC__
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diag_suppress = esa_on_defaulted_function_ignored
#else
#pragma diag_suppress = esa_on_defaulted_function_ignored
#endif
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#endif // __CUDACC__
#include <glm/glm.hpp>
#endif
#endif // USE_GLM

namespace flamegpu {

Expand Down
8 changes: 6 additions & 2 deletions include/flamegpu/runtime/detail/curve/curve.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@

#ifdef USE_GLM
#ifdef __CUDACC__
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diag_suppress = esa_on_defaulted_function_ignored
#else
#pragma diag_suppress = esa_on_defaulted_function_ignored
#endif
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#endif // __CUDACC__
#include <glm/glm.hpp>
#endif
#endif // USE_GLM

namespace flamegpu {
namespace detail {
Expand Down
10 changes: 9 additions & 1 deletion include/flamegpu/runtime/utility/DeviceMacroProperty.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,11 @@ __device__ __forceinline__ T DeviceMacroProperty<T, I, J, K, W>::CAS(T compare,

// GCC doesn't like seeing atomicExch with host compiler
#ifdef __CUDACC__
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diag_suppress = initialization_not_reachable
#else
#pragma diag_suppress = initialization_not_reachable
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
template<typename T, unsigned int I, unsigned int J, unsigned int K, unsigned int W>
__device__ __forceinline__ T DeviceMacroProperty<T, I, J, K, W>::exchange(T val) {
static_assert(std::is_same<T, int32_t>::value ||
Expand All @@ -444,8 +448,12 @@ __device__ __forceinline__ T DeviceMacroProperty<T, I, J, K, W>::exchange(T val)
return *reinterpret_cast<const T*>(&rval);
// return atomicExch(this->ptr, val);
}
#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
#pragma nv_diag_default = initialization_not_reachable
#else
#pragma diag_default = initialization_not_reachable
#endif
#endif // __NVCC_DIAG_PRAGMA_SUPPORT__
#endif // __CUDACC__

} // namespace flamegpu

Expand Down