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.

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

[DO NOT MERGE] Testing LLVM CI config #411

Draft
wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions ci/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.

cuda_oldest: &cuda_oldest '11.8'
cuda_newest: &cuda_newest '12.3'
cuda-oldest: &cuda-oldest '11.8'
cuda-newest: &cuda-newest '12.3'

gcc-oldest: &gcc-oldest { name: 'gcc', version: '11', exe: 'g++' }
gcc-newest: &gcc-newest { name: 'gcc', version: '12', exe: 'g++' }

llvm-oldest: &llvm-oldest { name: 'llvm', version: '15', exe: 'clang++' }
llvm-newest: &llvm-newest { name: 'llvm', version: '16', exe: 'clang++' }

# The GPUs to test on
# Note: This assumes that the appropriate gpu_build_archs are set to include building for the GPUs listed here
Expand Down Expand Up @@ -42,6 +48,7 @@ devcontainer_version: '23.12'
# Configurations that will run for every PR
pull_request:
nvcc:
- {cuda: *cuda_oldest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '11', exe: 'g++'}, gpu_build_archs: '70', std: [17], jobs: ['build', 'test']}
- {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '70', std: [17], jobs: ['build', 'test']}
- {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'arm64', compiler: {name: 'gcc', version: '12', exe: 'g++'}, gpu_build_archs: '60,90', std: [17], jobs: ['build']}
- {cuda: *cuda-oldest, os: 'ubuntu22.04', cpu: 'amd64', compiler: *gcc-oldest, gpu_build_archs: '70', std: [17], jobs: ['build', 'test']}
- {cuda: *cuda-newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: *gcc-newest, gpu_build_archs: '70', std: [17], jobs: ['build', 'test']}
- {cuda: *cuda-newest, os: 'ubuntu22.04', cpu: 'arm64', compiler: *gcc-newest, gpu_build_archs: '60,90', std: [17], jobs: ['build']}
- {cuda: *llvm-newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: *llvm-newest, gpu_build_archs: '60,90', std: [17], jobs: ['build']}
4 changes: 0 additions & 4 deletions include/cuco/detail/pair/pair.inl
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ __host__ __device__ constexpr bool operator==(cuco::pair<T1, T2> const& lhs,

} // namespace cuco

namespace thrust {
#include <cuco/detail/pair/tuple_helpers.inl>
} // namespace thrust

namespace cuda::std {
#include <cuco/detail/pair/tuple_helpers.inl>
} // namespace cuda::std
4 changes: 2 additions & 2 deletions include/cuco/detail/static_map.inl
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ __device__
"insert_and_find is not supported for unpackable data on pre-Volta GPUs.");
#endif

auto current_slot{initial_slot(insert_pair.first, hash)};
auto current_slot{this->initial_slot(insert_pair.first, hash)};

while (true) {
key_type const existing_key = current_slot->first.load(cuda::std::memory_order_relaxed);
Expand Down Expand Up @@ -514,7 +514,7 @@ __device__

// if we couldn't insert the key, but it wasn't a duplicate, then there must
// have been some other key there, so we keep looking for a slot
current_slot = next_slot(current_slot);
current_slot = this->next_slot(current_slot);
}
}

Expand Down
Loading