Skip to content

Commit

Permalink
ENH: bump Kokkos to release 3.7.02 (#56)
Browse files Browse the repository at this point in the history 
* ENH: bump Kokkos to release 3.7.02

* Remove python 3.6 from CI
  • Loading branch information
@NaderAlAwar
NaderAlAwar authored Oct 4, 2023
1 parent 94553b7 commit 88980d5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/linux-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
python-version: [3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
kokkos-branch: ['master', 'develop']

steps:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
python-version: [3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
kokkos-branch: ['master']

steps:
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
kokkos-branch: ['develop']

steps:
Expand All @@ -163,7 +163,7 @@ jobs:
python -m pip install 'cmake==3.20.2'

- name: Install Kokkos
if: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
if: ${{ matrix.python-version != '3.7' }}
run:
git clone -b ${{ matrix.kokkos-branch }} https://github.com/kokkos/kokkos.git /tmp/kokkos-source &&
cmake -B /tmp/kokkos-build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion external/kokkos
Submodule kokkos updated 70 files
+1 −1 .github/workflows/continuous-integration-workflow.yml
+1 −1 .jenkins
+44 −2 CHANGELOG.md
+5 −1 CMakeLists.txt
+11 −7 Makefile.kokkos
+1 −1 algorithms/cmake/Dependencies.cmake
+1 −1 algorithms/src/CMakeLists.txt
+16 −4 algorithms/src/Kokkos_Sort.hpp
+5 −3 bin/nvcc_wrapper
+3 −0 cmake/KokkosCore_config.h.in
+1 −0 cmake/compile_tests/cuda_compute_capability.cc
+12 −1 cmake/kokkos_arch.cmake
+0 −7 cmake/kokkos_tribits.cmake
+1 −1 containers/cmake/Dependencies.cmake
+44 −27 containers/src/Kokkos_DynRankView.hpp
+51 −30 containers/src/Kokkos_DynamicView.hpp
+62 −49 containers/src/Kokkos_OffsetView.hpp
+10 −0 containers/unit_tests/CMakeLists.txt
+1 −0 containers/unit_tests/TestCompileMain.cpp
+179 −0 containers/unit_tests/TestCreateMirror.cpp
+77 −0 containers/unit_tests/TestDynamicView.hpp
+1 −1 core/cmake/Dependencies.cmake
+1 −1 core/perf_test/test_atomic.cpp
+2 −1 core/src/Cuda/Kokkos_Cuda_BlockSize_Deduction.hpp
+3 −2 core/src/Cuda/Kokkos_Cuda_Half_Conversion.hpp
+1 −1 core/src/Cuda/Kokkos_Cuda_Locks.hpp
+72 −35 core/src/Cuda/Kokkos_Cuda_Parallel_Range.hpp
+1 −0 core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
+2 −0 core/src/HIP/Kokkos_HIP_Instance.cpp
+39 −21 core/src/HIP/Kokkos_HIP_Parallel_Range.hpp
+7 −10 core/src/HIP/Kokkos_HIP_ReduceScan.hpp
+1 −0 core/src/HIP/Kokkos_HIP_Shuffle_Reduce.hpp
+38 −27 core/src/Kokkos_CopyViews.hpp
+3 −5 core/src/Kokkos_Macros.hpp
+39 −19 core/src/Kokkos_ScratchSpace.hpp
+0 −8 core/src/Kokkos_Serial.hpp
+25 −12 core/src/Kokkos_View.hpp
+8 −8 core/src/Kokkos_WorkGraphPolicy.hpp
+1 −1 core/src/OpenACC/Kokkos_OpenACC_Traits.hpp
+9 −3 core/src/OpenMPTarget/Kokkos_OpenMPTarget_Instance.cpp
+1 −1 core/src/SYCL/Kokkos_SYCL.cpp
+8 −6 core/src/SYCL/Kokkos_SYCL_Parallel_Team.hpp
+1 −7 core/src/Serial/Kokkos_Serial.cpp
+7 −12 core/src/Serial/Kokkos_Serial_Parallel_MDRange.hpp
+2 −3 core/src/impl/Kokkos_ClockTic.hpp
+15 −8 core/src/impl/Kokkos_Core.cpp
+3 −1 core/src/impl/Kokkos_InitializationSettings.hpp
+1 −0 core/src/impl/Kokkos_MemoryPool.cpp
+3 −3 core/src/impl/Kokkos_Profiling.cpp
+5 −9 core/src/impl/Kokkos_ViewMapping.hpp
+2 −0 core/unit_test/CMakeLists.txt
+1 −0 core/unit_test/TestCompileMain.cpp
+126 −0 core/unit_test/TestCreateMirror.cpp
+14 −10 core/unit_test/TestDefaultDeviceTypeInit.hpp
+0 −2 core/unit_test/TestDetectionIdiom.cpp
+31 −11 core/unit_test/TestScan.hpp
+2 −2 core/unit_test/TestSharedAlloc.hpp
+129 −4 core/unit_test/TestTeam.hpp
+10 −0 core/unit_test/TestTeamReductionScan.hpp
+10 −0 core/unit_test/TestViewIsAssignable.hpp
+3 −1 core/unit_test/cuda/TestCuda_InterOp_Init.cpp
+3 −1 core/unit_test/cuda/TestCuda_InterOp_Streams.cpp
+3 −1 core/unit_test/hip/TestHIP_InterOp_Init.cpp
+3 −1 core/unit_test/hip/TestHIP_InterOp_Streams.cpp
+1 −1 core/unit_test/sycl/TestSYCL_InterOp_Init.cpp
+1 −0 core/unit_test/sycl/TestSYCL_InterOp_Init_Context.cpp
+6 −2 core/unit_test/sycl/TestSYCL_InterOp_Streams.cpp
+1 −0 master_history.txt
+1 −1 simd/cmake/Dependencies.cmake
+1 −1 tpls/desul/include/desul/atomics/Lock_Array_Cuda.hpp

0 comments on commit 88980d5

Please sign in to comment.