Merge branch 'kokkos' of github.com:khuck/xpress-apex into kokkos · UO-OACISS/apex@46ebb54 · GitHub

Commit

Merge branch 'kokkos' of github.com:khuck/xpress-apex into kokkos

Browse files

Conflicts:
	src/apex/apex_kokkos.cpp

Loading branch information

khuck committed Aug 11, 2020

2 parents 6890b8e + bfc461e commit 46ebb54