Skip to content

Commit

Permalink
Update vendored TPLS
Browse files Browse the repository at this point in the history
- Update kokkos to 4.2.01
- Update kokkos-kernels to 4.2.01
- Update pybind11 to 2.9.2
- Fixed typo in a print statement
  • Loading branch information
kuberry committed Jan 30, 2024
1 parent a862f87 commit 05c94ee
Show file tree
Hide file tree
Showing 3,297 changed files with 276,968 additions and 206,720 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
85 changes: 85 additions & 0 deletions kokkos-kernels/.github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
name: github-DOCS

on:
pull_request:
branches:
- master
- develop

permissions:
contents: none

jobs:
docs-check:
runs-on: [macos-latest]
steps:
- name: Install Dependencies
run: |
brew install doxygen
python3 -m pip install sphinx -v "sphinx==6.2.1"
python3 -m pip install breathe
python3 -m pip install sphinx-rtd-theme
sphinx-build --version
doxygen --version
- name: checkout_kokkos_kernels
uses: actions/checkout@v3
with:
path: kokkos-kernels

- name: checkout_kokkos
uses: actions/checkout@v3
with:
repository: kokkos/kokkos
ref: develop
path: kokkos

- name: configure_kokkos
run: |
mkdir -p kokkos/{build,install}
cd kokkos/build
cmake \
-DCMAKE_CXX_FLAGS="-Werror" \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_PREFIX=$PWD/../install \
-DKokkos_ENABLE_COMPILER_WARNINGS=ON \
-DKokkos_ENABLE_DEPRECATED_CODE_3=OFF \
-DKokkos_ENABLE_TESTS=OFF \
-DKokkos_ENABLE_DEPRECATED_CODE_4=OFF \
..
- name: build_and_install_kokkos
working-directory: kokkos/build
run: make -j2 install

- name: configure_kokkos_kernels
run: |
mkdir -p kokkos-kernels/{build,install}
cd kokkos-kernels/build
cmake \
-DKokkos_DIR=$PWD/../../kokkos/install/lib/cmake/Kokkos \
-DCMAKE_INSTALL_PREFIX=$PWD/../install \
-DKokkosKernels_ENABLE_DOCS=ON \
..
- name: build_kokkos_kernels_doxygen
working-directory: kokkos-kernels/build
run: |
echo "Redirecting full output to doxygen.out..."
make Doxygen > doxygen.out 2>&1 || true
error_ret=$(grep 'Error' doxygen.out | head -c 1) || true
if [ ! -z $error_ret ]; then
echo "---- BEGIN: Summary of errors ---- "
cat doxygen.out | grep -i 'error:' || true
echo "---- END: Summary of errors ---- "
echo
echo
echo "---- BEGIN: Summary of warnings ---- "
cat doxygen.out | grep -i 'warning:' || true
echo "---- END: Summary of warnings ---- "
exit 1
fi
- name: build_kokkos_kernels_sphinx
working-directory: kokkos-kernels/build
run: make Sphinx
18 changes: 15 additions & 3 deletions kokkos-kernels/.github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ on:
- master
- develop

permissions:
contents: none

jobs:
clang-format-check:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install Dependencies
run: sudo apt install clang-format-8
Expand All @@ -28,9 +31,18 @@ jobs:
fi
done
# If any diffs exist, error out
# If any diffs exist, print the patch and error out
if [[ ! -z $(git status -s -uno . -- ':!.github') ]]; then
echo "The following files require formatting changes:"
git status -s -uno . -- ':!.github'
echo "==== Begin Format Patch ===="
# --cached means show staged changes (git add above)
git --no-pager diff --patch --cached
echo "==== End Format Patch ===="
echo "To automate formatting, see:"
echo " https://kokkos-kernels.readthedocs.io/en/latest/developer/style.html#id1"
exit 1
fi
46 changes: 37 additions & 9 deletions kokkos-kernels/.github/workflows/osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,33 @@ name: github-OSX

on:
pull_request:
branches:
- master
- develop
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:
check-pr-labels:
runs-on: [ubuntu-latest]
steps:
- uses: docker://agilepathway/pull-request-label-checker:latest
with:
none_of: 'AT: WIP'
repo_token: ${{ secrets.GITHUB_TOKEN }}
osxci:
needs: check-pr-labels
# TODO: allow re-run via retest label if: ${{ github.event.label.name == 'AT: RETEST' }}
name: osx-ci
runs-on: [macos-latest]

Expand All @@ -16,37 +37,43 @@ jobs:
include:
- backend: "SERIAL"
cmake_build_type: "RelWithDebInfo"
debug_bounds_check: "ON"
- backend: "THREADS"
cmake_build_type: "RelWithDebInfo"
debug_bounds_check: "ON"
- backend: "SERIAL"
cmake_build_type: "Debug"
debug_bounds_check: "OFF"
- backend: "SERIAL"
cmake_build_type: "Release"
debug_bounds_check: "ON"

steps:
- name: checkout_kokkos_kernels
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: kokkos-kernels

- name: checkout_kokkos
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: kokkos/kokkos
ref: ${{ github.base_ref }}
path: kokkos

- name: configure_kokkos
run: |
ls -lat
mkdir -p kokkos/{build,install}
cd kokkos/build
cmake \
-DKokkos_ENABLE_${{ matrix.backend }}=ON \
-DCMAKE_CXX_FLAGS="-Werror" \
-DCMAKE_CXX_STANDARD=14 \
-DCMAKE_CXX_STANDARD=17 \
-DKokkos_ENABLE_COMPILER_WARNINGS=ON \
-DKokkos_ENABLE_DEBUG_BOUNDS_CHECK:BOOL=${{ matrix.debug_bounds_check }} \
-DKokkos_ENABLE_DEPRECATED_CODE_3=OFF \
-DKokkos_ENABLE_TESTS=OFF \
-DKokkos_ENABLE_DEPRECATED_CODE_4=OFF \
-DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
-DCMAKE_INSTALL_PREFIX=$PWD/../install \
..
Expand All @@ -57,7 +84,6 @@ jobs:

- name: configure_kokkos_kernels
run: |
ls -lat
mkdir -p kokkos-kernels/{build,install}
cd kokkos-kernels/build
cmake \
Expand All @@ -73,6 +99,8 @@ jobs:
-DKokkosKernels_INST_FLOAT=ON \
-DKokkosKernels_INST_LAYOUTLEFT:BOOL=ON \
-DKokkosKernels_INST_LAYOUTRIGHT:BOOL=ON \
-DKokkosKernels_INST_OFFSET_INT=ON \
-DKokkosKernels_INST_OFFSET_SIZE_T=ON \
-DKokkosKernels_ENABLE_TPL_CUSPARSE=OFF \
-DKokkosKernels_ENABLE_TPL_CUBLAS=OFF \
..
Expand All @@ -83,4 +111,4 @@ jobs:

- name: test
working-directory: kokkos-kernels/build
run: ctest -j2 --output-on-failure
run: ctest -j2 --output-on-failure --timeout 7200
5 changes: 5 additions & 0 deletions kokkos-kernels/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@
.project
*.o
TAGS

#Clangd indexing
compile_commands.json
.cache/
.vscode/
16 changes: 10 additions & 6 deletions kokkos-kernels/.jenkins/nightly.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ pipeline {
}
}
steps {
sh '''rm -rf kokkos &&
sh '''. /opt/intel/oneapi/setvars.sh --include-intel-llvm && \
rm -rf kokkos &&
git clone -b develop https://github.com/kokkos/kokkos.git && cd kokkos && \
mkdir build && cd build && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_CXX_COMPILER=/opt/intel/oneapi/compiler/2023.0.0/linux/bin-llvm/clang++ \
-DKokkos_ARCH_VOLTA70=ON \
-DKokkos_ENABLE_DEPRECATED_CODE_3=OFF \
-DKokkos_ENABLE_SYCL=ON \
Expand All @@ -32,10 +33,11 @@ pipeline {
.. && \
make -j8 && make install && \
cd ../.. && rm -rf kokkos'''
sh '''rm -rf build && mkdir -p build && cd build && \
sh '''. /opt/intel/oneapi/setvars.sh --include-intel-llvm && \
rm -rf build && mkdir -p build && cd build && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_CXX_COMPILER=/opt/intel/oneapi/compiler/2023.0.0/linux/bin-llvm/clang++ \
-DKokkosKernels_ENABLE_TESTS=ON \
-DKokkosKernels_ENABLE_EXAMPLES=ON \
-DKokkosKernels_INST_DOUBLE=ON \
Expand All @@ -46,12 +48,12 @@ pipeline {
}
}

stage('HIP-ROCm-4.5-C++14') {
stage('HIP-ROCm-5.2') {
agent {
dockerfile {
filename 'Dockerfile.hip'
dir 'scripts/docker'
additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:4.5'
additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:5.2'
label 'rocm-docker && vega'
args '-v /tmp/ccache.kokkos:/tmp/ccache --device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video --env HIP_VISIBLE_DEVICES=$HIP_VISIBLE_DEVICES'
}
Expand All @@ -62,6 +64,7 @@ pipeline {
mkdir build && cd build && \
cmake \
-DCMAKE_CXX_COMPILER=hipcc \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_EXTENSIONS=OFF \
-DKokkos_ENABLE_HIP=ON \
.. && \
Expand All @@ -71,6 +74,7 @@ pipeline {
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_COMPILER=hipcc \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_CXX_EXTENSIONS=OFF \
-DKokkosKernels_ENABLE_TESTS=ON \
-DKokkosKernels_ENABLE_EXAMPLES=ON \
Expand Down
8 changes: 7 additions & 1 deletion kokkos-kernels/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ endif()
* KokkosKernels_ENABLE_TESTS: BOOL
* Whether to build tests.
* Default: OFF
* KokkosKernels_ENABLE_PERFTESTS: BOOL
* Whether to build performance tests.
* Default: ON
* KokkosKernels_ENABLE_TESTS_AND_PERFSUITE: BOOL
* Whether to build performance tests and suite.
* Default: OFF
* KokkosKernels_ENABLE_DOCS: BOOL
* Whether to build docs.
* Default: OFF
Expand Down Expand Up @@ -186,7 +192,7 @@ endif()
* Whether to pre instantiate kernels for the scalar type double. This option is KokkosKernels_INST_DOUBLE=ON by default. Disabling this may increase build times.
* Default: ON
* KokkosKernels_INST_EXECSPACE_OPENMP: BOOL
* Whether to pre instantiate kernels for the execution space Kokkos::OpenMP. Disabling this when Kokkos_ENABLE_OpenMP is enabled may increase build times.
* Whether to pre instantiate kernels for the execution space Kokkos::OpenMP. Disabling this when Kokkos_ENABLE_OPENMP is enabled may increase build times.
* Default: ON if Kokkos is OpenMP-enabled, OFF otherwise.
* KokkosKernels_INST_EXECSPACE_SERIAL: BOOL
* Whether to build kernels for the execution space Kokkos::Serial. If explicit template instantiation (ETI) is enabled in Trilinos, disabling this when Kokkos_ENABLE_SERIAL is enabled may increase build times.
Expand Down
Loading

0 comments on commit 05c94ee

Please sign in to comment.