Skip to content

Commit

Permalink
Merge pull request #311 from sandialabs/bump_kokkos_v4_4_1
Browse files Browse the repository at this point in the history
    Bump version to 1.6.0
    
    - Dropped support for Kokkos < 4
    - Updated vendored Kokkos and Kokkos-Kernels to 4.4.01
    - Updated vendored pybind11 to 2.13.6
    - Fixes to support numpy > 2
  • Loading branch information
kuberry authored Dec 4, 2024
2 parents 9cecd5c + 93255f3 commit 6d51a0b
Show file tree
Hide file tree
Showing 3,936 changed files with 398,304 additions and 329,888 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 4 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ else() # Raw CMake Project
set(KOKKOSKERNELS_IN_TRILINOS OFF)
set(KOKKOSKERNELS_EXISTING_ELSEWHERE OFF)
set(KOKKOSKERNELS_BUILT_FOR_USER OFF)
set(KOKKOS_MIN "3.3.01")
set(KOKKOS_MIN "4.0.00")

if (Trilinos_PREFIX)
FIND_PACKAGE(Trilinos COMPONENTS Kokkos KokkosKernels OPTIONAL_COMPONENTS Gtest)
Expand Down Expand Up @@ -318,11 +318,7 @@ else() # Raw CMake Project
get_directory_property(Kokkos_VERSION DIRECTORY kokkos DEFINITION Kokkos_VERSION)
message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
endif()
if(Kokkos_VERSION VERSION_LESS "3.7")
set(KOKKOS_THREADS_ARG "--kokkos-threads")
else()
set(KOKKOS_THREADS_ARG "--kokkos-num-threads")
endif()
set(KOKKOS_THREADS_ARG "--kokkos-num-threads")

if (KOKKOSKERNELS_IN_TRILINOS)
if (Compadre_USE_CUDA)
Expand Down Expand Up @@ -357,6 +353,8 @@ else() # Raw CMake Project
SET(KokkosKernels_ENABLE_TPL_CUBLAS OFF)
OPTION(KokkosKernels_ENABLE_TPL_CUSPARSE "" OFF)
SET(KokkosKernels_ENABLE_TPL_CUSPARSE OFF)
OPTION(KokkosKernels_ENABLE_TPL_CUSOLVER "" OFF)
SET(KokkosKernels_ENABLE_TPL_CUSOLVER OFF)
OPTION(KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE "" OFF)
SET(KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE OFF)
OPTION(KokkosKernels_INST_EXECSPACE_THREADS "" ${Kokkos_ENABLE_THREADS})
Expand Down
2 changes: 1 addition & 1 deletion cmake/Compadre_Version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.9
1.6.0
1 change: 1 addition & 0 deletions kokkos-kernels/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ SortIncludes: false
AlignConsecutiveAssignments: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: true
ColumnLimit: 120
19 changes: 19 additions & 0 deletions kokkos-kernels/.git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#
# Add formatting and other uninteresting commits here and
# 'git blame $file' will skip them IF
# A) you have it configured to do so globally (dangerous, this will break git blame on repos that don't have a .git-blame-ignore-revs file.
# git config --global blame.ignoreRevsFile .git-blame-ignore-revs
# OR
# B) you have it configured to do so locally (tedious, you have to remember to do this in every KK clone)
# git config blame.ignoreRevsFile .git-blame-ignore-revs
# OR
# C) you have an aliased blame command for KokkosKernels:
# git config --global alias.kkblame 'blame --ignore-revs-file=.git-blame-ignore-revs'
# NOTE: this implies you run 'git kkblame $file'
# OR
# D) you explicitly tell blame to skip them
# git blame --ignore-revs-file=.git-blame-ignore-revs $file
#
# List skips here:
985c3a9e7343c2f612560024cae4d968f800c8ac
0ffb820881335beb0e78463c19988a0c61044705
14 changes: 14 additions & 0 deletions kokkos-kernels/.github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Security Policy

## Supported Versions

Kokkos Kernels will issue vulnerability fixes in the develop branch of the project repository.
Typically a patch release will be issued shortly after a vulnerability is detected and fixed.
The project does not typically issue patch releases for older versions and if it happens, announcements will be made on our website and/or slack channel.

## Reporting a Vulnerability

To report a security issue, please email [email protected] and [email protected] with a description of the issue, the steps you took to create the issue, affected versions, and, if known, mitigations for the issue.
Our vulnerability management team will respond within 5 working days of your email.
If the issue is confirmed as a vulnerability, we will open a Security Advisory.
This project follows a 90 day disclosure timeline.
11 changes: 11 additions & 0 deletions kokkos-kernels/.github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: weekly

- package-ecosystem: pip
directory: /docs
schedule:
interval: weekly
29 changes: 29 additions & 0 deletions kokkos-kernels/.github/workflows/at2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: github-AT2

on:
pull_request:
paths-ignore:
- '**/*.rst'
- '**/*.md'
- '**/requirements.txt'
- '**/*.py'
- 'docs/**'
types: [ opened, reopened, synchronize ]

permissions:
contents: none

# Cancels any in progress 'workflow' associated with this PR
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
mi210:
uses: ./.github/workflows/mi210.yml
h100:
uses: ./.github/workflows/h100.yml
bdw:
uses: ./.github/workflows/bdw.yml
#spr:
#uses: ./.github/workflows/spr.yml
Loading

0 comments on commit 6d51a0b

Please sign in to comment.