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

Sparse and CI updates #1411

Merged
merged 3 commits into from
May 16, 2022
Merged

Sparse and CI updates #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb1afe1
src/sparse: Fix & check for fence post errors
e10harvey May 10, 2022
efccd27
.github/workflows:
e10harvey May 13, 2022
c98065c
.github/workflows: Skip OSX when 'AT: WIP' exists
e10harvey May 13, 2022
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
20 changes: 16 additions & 4 deletions .github/workflows/osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@ name: github-OSX

on:
pull_request:
branches:
- master
- develop
types: [ opened, labeled, unlabeled, reopened, synchronize ]

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,12 +23,16 @@ 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
Expand All @@ -46,6 +57,7 @@ jobs:
-DCMAKE_CXX_FLAGS="-Werror" \
-DCMAKE_CXX_STANDARD=14 \
-DKokkos_ENABLE_COMPILER_WARNINGS=ON \
-DKokkos_ENABLE_DEBUG_BOUNDS_CHECK:BOOL=${{ matrix.debug_bounds_check }} \
-DKokkos_ENABLE_DEPRECATED_CODE_3=OFF \
-DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
-DCMAKE_INSTALL_PREFIX=$PWD/../install \
Expand Down Expand Up @@ -85,4 +97,4 @@ jobs:

- name: test
working-directory: kokkos-kernels/build
run: ctest -j2 --output-on-failure --timeout 2500
run: ctest -j2 --output-on-failure --timeout 3600
5 changes: 2 additions & 3 deletions src/sparse/KokkosSparse_csc2csr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ class Csc2Csr {
// Use exclusive scan so we can allocate the row map uninitialized and
// avoid accessing device views on the host.
KE::exclusive_scan(crsET, KE::cbegin(__crs_row_cnt),
KE::cend(__crs_row_cnt) + 1, KE::begin(__crs_row_map),
0);
KE::cend(__crs_row_cnt), KE::begin(__crs_row_map), 0);
CrsET().fence();
Kokkos::deep_copy(__crs_row_map_scratch, __crs_row_map);
CrsET().fence();
Expand Down Expand Up @@ -203,7 +202,7 @@ class Csc2Csr {
__crs_col_ids = CrsColIdViewType(
Kokkos::view_alloc(Kokkos::WithoutInitializing, "__crs_col_ids"), nnz);

__crs_row_cnt = RowIdViewType("__crs_row_cnt", __nrows);
__crs_row_cnt = RowIdViewType("__crs_row_cnt", __nrows + 1);

__Functor<typename TeamPolicyType::member_type> functor(
__nrows, __ncols, __nnz, __vals, __crs_vals, __row_ids, __crs_row_map,
Expand Down