Feature sparse ILU(k) #459

vqd8a · 2019-08-27T16:16:05Z

spiluk: Kokkos-based sparse ILU(k) routines. This is an initial commit with sparse ILU(k) handle, symbolic, and numeric routines + ETI infrastructure. Two implementations are done using RangePolicy and TeamPolicy. All components are placed in Experimental namespace.

…policy

vqd8a · 2019-09-05T14:37:57Z

@srajama1 It is ready for your review. Thanks.

perf_test/sparse/KokkosSparse_spiluk.cpp

mhoemmen · 2019-09-28T01:27:10Z

src/sparse/impl/KokkosSparse_spiluk_numeric_impl.hpp

+      if ( my_team == 0 ) L_values(k) = fact; 
+
+      team.team_barrier();
+
      Kokkos::parallel_for( Kokkos::TeamThreadRange( team, U_row_map(prev_row)+1, U_row_map(prev_row+1) ), [&] ( const long kk ) {


Could U_row_map(prev_row) be unsigned? If so, then this might emit build warnings, since it would cast from unsigned to signed (long). Also, long is almost never the right type for anything. (It's not even 64 bits on some platforms.)

Thanks @mhoemmen for pointing it out. I fixed it in the new commit.

mhoemmen · 2019-09-28T01:28:10Z

src/sparse/impl/KokkosSparse_spiluk_numeric_impl.hpp

@@ -382,8 +385,8 @@ void iluk_numeric ( IlukHandle& thandle,

  HandleDeviceEntriesType level_idx = thandle.get_level_idx();

-  typedef Kokkos::View< nnz_lno_t**, Kokkos::LayoutLeft, Kokkos::Device<execution_space,memory_space> > WorkViewType;
-
+  typedef Kokkos::View< nnz_lno_t**, Kokkos::Device<execution_space,memory_space> > WorkViewType;


Prefer C++11 - style using over typedef:

using WorkViewType = Kokkos::View<nnz_lno_t**, Kokkos::Device<execution_space,memory_space>>;

Note that C++11 permits the two trailing >> to be next to each other. You don't need to leave a space between them.

Thanks @mhoemmen . I replaced typedefwith using in the new commit.

Thanks @vqd8a !

vqd8a · 2019-10-02T20:11:18Z

Spotcheck on White passed: ../kokkos-kernels/scripts/test_all_sandia --spot-check --with-cuda-options=enable_lambda --arch=Power8,Pascal60

Running on machine: white
Going to test compilers:  gcc/6.4.0 gcc/7.2.0 ibm/16.1.0 cuda/9.2.88 cuda/10.0.130
Testing compiler gcc/6.4.0
Testing compiler gcc/7.2.0
  Starting job gcc-7.2.0-OpenMP-release
  Starting job gcc-6.4.0-OpenMP_Serial-release
  PASSED gcc-7.2.0-OpenMP-release
  Starting job gcc-7.2.0-Serial-release
  PASSED gcc-6.4.0-OpenMP_Serial-release
Testing compiler ibm/16.1.0
  Starting job gcc-7.2.0-OpenMP_Serial-release
  PASSED gcc-7.2.0-Serial-release
Testing compiler cuda/9.2.88
  Starting job ibm-16.1.0-Serial-release
  PASSED gcc-7.2.0-OpenMP_Serial-release
  PASSED ibm-16.1.0-Serial-release
Testing compiler cuda/10.0.130
  Starting job cuda-9.2.88-Cuda_OpenMP-release
  PASSED cuda-9.2.88-Cuda_OpenMP-release
  Starting job cuda-10.0.130-Cuda_Serial-release
  PASSED cuda-10.0.130-Cuda_Serial-release
#######################################################
PASSED TESTS
#######################################################
cuda-10.0.130-Cuda_Serial-release build_time=1191 run_time=285
cuda-9.2.88-Cuda_OpenMP-release build_time=1234 run_time=219
gcc-6.4.0-OpenMP_Serial-release build_time=550 run_time=333
gcc-7.2.0-OpenMP-release build_time=389 run_time=136
gcc-7.2.0-OpenMP_Serial-release build_time=666 run_time=364
gcc-7.2.0-Serial-release build_time=252 run_time=188
ibm-16.1.0-Serial-release build_time=1373 run_time=262
#######################################################
FAILED TESTS
#######################################################

Spotcheck on Bowman passed: ../kokkos-kernels/scripts/test_all_sandia --spot-check

Running on machine: bowman
Going to test compilers:  intel/16.4.258 intel/17.2.174 intel/18.2.199
Testing compiler intel/16.4.258
  Starting job intel-16.4.258-Serial-release
  Starting job intel-16.4.258-Pthread-release
  PASSED intel-16.4.258-Serial-release
Testing compiler intel/17.2.174
  Starting job intel-16.4.258-Pthread_Serial-release
  PASSED intel-16.4.258-Pthread-release
  Starting job intel-17.2.174-OpenMP-release
  PASSED intel-17.2.174-OpenMP-release
  Starting job intel-17.2.174-Pthread-release
  PASSED intel-16.4.258-Pthread_Serial-release
  Starting job intel-17.2.174-Serial-release
  PASSED intel-17.2.174-Pthread-release
  Starting job intel-17.2.174-OpenMP_Serial-release
  PASSED intel-17.2.174-Serial-release
Testing compiler intel/18.2.199
  Starting job intel-17.2.174-Pthread_Serial-release
  PASSED intel-17.2.174-OpenMP_Serial-release
  Starting job intel-18.2.199-OpenMP-release
  PASSED intel-17.2.174-Pthread_Serial-release
  Starting job intel-18.2.199-Pthread-release
  PASSED intel-18.2.199-OpenMP-release
  Starting job intel-18.2.199-Serial-release
  PASSED intel-18.2.199-Pthread-release
  Starting job intel-18.2.199-OpenMP_Serial-release
  PASSED intel-18.2.199-Serial-release
  Starting job intel-18.2.199-Pthread_Serial-release
  PASSED intel-18.2.199-OpenMP_Serial-release
  PASSED intel-18.2.199-Pthread_Serial-release
#######################################################
PASSED TESTS
#######################################################
intel-16.4.258-Pthread-release build_time=1540 run_time=585
intel-16.4.258-Pthread_Serial-release build_time=2521 run_time=1258
intel-16.4.258-Serial-release build_time=1481 run_time=620
intel-17.2.174-OpenMP-release build_time=1989 run_time=371
intel-17.2.174-OpenMP_Serial-release build_time=2940 run_time=1098
intel-17.2.174-Pthread-release build_time=1340 run_time=618
intel-17.2.174-Pthread_Serial-release build_time=2480 run_time=1260
intel-17.2.174-Serial-release build_time=1411 run_time=655
intel-18.2.199-OpenMP-release build_time=1612 run_time=407
intel-18.2.199-OpenMP_Serial-release build_time=2859 run_time=1001
intel-18.2.199-Pthread-release build_time=1237 run_time=624
intel-18.2.199-Pthread_Serial-release build_time=2450 run_time=1217
intel-18.2.199-Serial-release build_time=1217 run_time=663
#######################################################
FAILED TESTS
#######################################################

vqd8a · 2019-10-02T20:12:53Z

@srajama1 Spotchecks passed. Could you please merge when you have time? Thanks.

srajama1 · 2019-10-03T01:55:28Z

This requires a thumbs up from @mhoemmen

vqd8a · 2019-10-08T17:35:33Z

@mhoemmen could you please review this? so that we can merge. Thanks.

mhoemmen · 2019-10-09T07:27:20Z

There are 536 files to review; I would need a P/T for that kind of work and I'd prefer not to approve blindly. You can approve it yourself.

vqd8a · 2019-10-22T16:46:15Z

@srajama1 in this case, could you please consider merging? Thanks.

srajama1

Some minor comments for next round, this can go in as it is.

srajama1 · 2019-11-06T19:23:52Z

src/sparse/impl/KokkosSparse_spiluk_numeric_impl.hpp

+          class UEntriesType,
+          class UValuesType>
+void iluk_numeric ( IlukHandle& thandle,
+                    const ARowMapType&  A_row_map,


Might need a refactor, not just here in other places as well, to use the Crsmatrix instead of the three pointers .

srajama1 · 2019-11-06T19:25:12Z

src/impl/tpls/KokkosSparse_spiluk_symbolic_tpl_spec_avail.hpp

@@ -0,0 +1,65 @@
+/*
+//@HEADER
+// ************************************************************************


Could add cusparse here for ILU(0) only.

Add preliminary implementation of ILU(k) using range policy and team …

0a49a3a

…policy

vqd8a requested a review from srajama1 August 27, 2019 16:16

vqd8a added 2 commits August 27, 2019 10:33

Merge branch 'develop' into sp_iluk

d3dcd5b

Update Makefile with spiluk test

e055418

vqd8a marked this pull request as ready for review August 27, 2019 19:47

Add perf test

fb603f5

mhoemmen reviewed Sep 5, 2019

View reviewed changes

Modify according to Mark's comments

06ea223

mhoemmen reviewed Sep 6, 2019

View reviewed changes

perf_test/sparse/KokkosSparse_spiluk.cpp Outdated Show resolved Hide resolved

Add team barrier for accurate results and fix layout for tmp work view

d94fb37

mhoemmen reviewed Sep 28, 2019

View reviewed changes

vqd8a added 5 commits September 30, 2019 14:05

Change long type to row_map type and use style using instead of typedef

5a393c7

Some minor changes to allow testing wide ranges of matrices

43df315

Merge branch 'develop' into sp_iluk

bc9c500

Fix warnings of comparison between signed and unsigned integer

0ca5e15

Fix shadow warnings

c5889d5

srajama1 approved these changes Nov 6, 2019

View reviewed changes

srajama1 merged commit f14b222 into develop Nov 6, 2019

ndellingwood mentioned this pull request Jan 28, 2020

Kokkos + KokkosKernels Promotion To 2.9.99 trilinos/Trilinos#6671

Merged

ndellingwood deleted the sp_iluk branch October 29, 2020 16:01

kokkos-devops-admin mentioned this pull request Jun 8, 2023

Remove non-existant subdir kokkos-kernels/common/common (#11921, #11863) #1854

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature sparse ILU(k) #459

Feature sparse ILU(k) #459

vqd8a commented Aug 27, 2019

vqd8a commented Sep 5, 2019

mhoemmen Sep 28, 2019

vqd8a Sep 30, 2019

mhoemmen Sep 28, 2019

vqd8a Sep 30, 2019 •

edited

Loading

mhoemmen Oct 9, 2019

vqd8a commented Oct 2, 2019

vqd8a commented Oct 2, 2019

srajama1 commented Oct 3, 2019

vqd8a commented Oct 8, 2019

mhoemmen commented Oct 9, 2019

vqd8a commented Oct 22, 2019

srajama1 left a comment

srajama1 Nov 6, 2019

srajama1 Nov 6, 2019

Feature sparse ILU(k) #459

Feature sparse ILU(k) #459

Conversation

vqd8a commented Aug 27, 2019

vqd8a commented Sep 5, 2019

mhoemmen Sep 28, 2019

Choose a reason for hiding this comment

vqd8a Sep 30, 2019

Choose a reason for hiding this comment

mhoemmen Sep 28, 2019

Choose a reason for hiding this comment

vqd8a Sep 30, 2019 • edited Loading

Choose a reason for hiding this comment

mhoemmen Oct 9, 2019

Choose a reason for hiding this comment

vqd8a commented Oct 2, 2019

vqd8a commented Oct 2, 2019

srajama1 commented Oct 3, 2019

vqd8a commented Oct 8, 2019

mhoemmen commented Oct 9, 2019

vqd8a commented Oct 22, 2019

srajama1 left a comment

Choose a reason for hiding this comment

srajama1 Nov 6, 2019

Choose a reason for hiding this comment

srajama1 Nov 6, 2019

Choose a reason for hiding this comment

vqd8a Sep 30, 2019 •

edited

Loading