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.

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

Refact/sparse comm #96

Merged
merged 131 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
fd2e5d8
base on sparse communicator branch
greole Oct 26, 2023
c9d2c03
adapt to new Ginkgo version
greole Oct 27, 2023
913b79c
Use localized_partition
greole Oct 27, 2023
53b97c0
Fixup
greole Oct 27, 2023
400b861
construct sparse communicator
greole Oct 31, 2023
ab0d0e2
reformat
greole Oct 31, 2023
6ebed5e
reformat
greole Oct 31, 2023
214cde7
Allow - as separator
greole Oct 31, 2023
dfaca26
Allow - as separator
greole Oct 31, 2023
c33c27b
switch gko version to include try-run patch
greole Oct 31, 2023
6eca357
add a todo fixme notes check
greole Oct 31, 2023
6132126
Merge branch 'refact/sparse_comm' of github.com:hpsim/OGL into refact…
greole Oct 31, 2023
d82ac3f
add a todo fixme notes check
greole Oct 31, 2023
27b2bda
add a todo fixme notes check
greole Oct 31, 2023
110310f
add read_distributed with sparse comm
greole Nov 1, 2023
024acdb
use local indices
greole Nov 3, 2023
a6f341d
fixup
greole Nov 3, 2023
7aa7c4c
compute send_idxs
greole Nov 6, 2023
25e80f7
reorder header
greole Nov 6, 2023
e360350
move ctr to body
greole Nov 6, 2023
0c96fff
remove gko globalIndex
greole Nov 6, 2023
0eef355
add stopping criterion
greole Nov 6, 2023
fa62373
switch gko branch
greole Nov 6, 2023
7ec2633
reformat
greole Nov 6, 2023
235c3c6
format
greole Nov 6, 2023
41cf412
fix typo
greole Nov 6, 2023
63b1360
Move ctr to .C file
greole Nov 7, 2023
ec020eb
use concrete types for interfaces
greole Nov 7, 2023
3d8572b
clean-up
greole Nov 8, 2023
109f6bf
add fs creation
greole Nov 8, 2023
62c3ae5
Fixup pass stopping vector
greole Nov 8, 2023
a344ef3
add stopping crit vect to GMRES, format
greole Nov 8, 2023
26138ee
pass CommunicationPattern, move free functions to separate TU
greole Nov 10, 2023
bd9a2a8
format
greole Nov 10, 2023
a96154b
improve documentation, remove unneeded parameters
greole Nov 10, 2023
ea9284e
format
greole Nov 10, 2023
2b33020
base on sparse communicator branch
greole Oct 26, 2023
29bd1cb
adapt to new Ginkgo version
greole Oct 27, 2023
169f87b
Use localized_partition
greole Oct 27, 2023
f020611
Fixup
greole Oct 27, 2023
9451d53
construct sparse communicator
greole Oct 31, 2023
b8fca33
reformat
greole Oct 31, 2023
c51a5e6
reformat
greole Oct 31, 2023
42b1620
add a todo fixme notes check
greole Oct 31, 2023
463199f
Allow - as separator
greole Oct 31, 2023
0111076
Allow - as separator
greole Oct 31, 2023
e046396
switch gko version to include try-run patch
greole Oct 31, 2023
622e8da
add a todo fixme notes check
greole Oct 31, 2023
74c757c
add a todo fixme notes check
greole Oct 31, 2023
9c5732f
add read_distributed with sparse comm
greole Nov 1, 2023
c7f32c6
use local indices
greole Nov 3, 2023
3a5a687
fixup
greole Nov 3, 2023
726420c
compute send_idxs
greole Nov 6, 2023
d38eca9
reorder header
greole Nov 6, 2023
7949579
move ctr to body
greole Nov 6, 2023
f840fe2
remove gko globalIndex
greole Nov 6, 2023
adabcfd
add stopping criterion
greole Nov 6, 2023
ea10114
switch gko branch
greole Nov 6, 2023
efa2a61
reformat
greole Nov 6, 2023
e584346
format
greole Nov 6, 2023
a604389
fix typo
greole Nov 6, 2023
c8cdbbb
Move ctr to .C file
greole Nov 7, 2023
7b79a72
use concrete types for interfaces
greole Nov 7, 2023
d41ef19
clean-up
greole Nov 8, 2023
7a9c400
add fs creation
greole Nov 8, 2023
5ce8569
Fixup pass stopping vector
greole Nov 8, 2023
96092bd
add stopping crit vect to GMRES, format
greole Nov 8, 2023
b80141e
pass CommunicationPattern, move free functions to separate TU
greole Nov 10, 2023
cd91cba
format
greole Nov 10, 2023
ec97363
improve documentation, remove unneeded parameters
greole Nov 10, 2023
1698f3b
format
greole Nov 10, 2023
ff0d531
start unit tests
greole Nov 10, 2023
596f646
implement basic unit test
greole Nov 13, 2023
d20a94b
added missing namespace, fix double definition
greole Nov 13, 2023
0ae6b35
delete unneeded file
greole Nov 13, 2023
b60d989
link to stdfs
greole Nov 13, 2023
e1fbac3
add basic unit test
greole Nov 13, 2023
c88cacd
add non-symmetric test
greole Nov 14, 2023
af534a6
move init_sparsity to free function and add unit test
greole Nov 15, 2023
2cd456e
update required versions
greole Nov 15, 2023
b39f462
add unit tests to pipeline
greole Nov 15, 2023
6f63f46
add unit tests to pipeline
greole Nov 15, 2023
b7aae49
format
greole Nov 15, 2023
0be7b0c
format
greole Nov 15, 2023
ff0b489
format
greole Nov 17, 2023
66ff6bd
Merge branch 'refact/sparse_comm' into enh/unit_tests
greole Nov 17, 2023
b819278
fix typo
greole Nov 17, 2023
7384793
format
greole Nov 17, 2023
33cc660
Merge pull request #97 from hpsim/enh/unit_tests
greole Nov 17, 2023
c3f26f3
remove note
greole Nov 17, 2023
53f5a1e
fixup workflow file name
greole Nov 17, 2023
6360493
pass arguments to workflow, add job
greole Nov 17, 2023
75dcc0c
fixup workflow
greole Nov 17, 2023
cb35594
fixup path
greole Nov 17, 2023
dd87745
fix matrix call, clean up
greole Nov 17, 2023
4ec167f
add compression to non local column index
greole Nov 17, 2023
f186732
communicate neighbour cell indices to calculate compressed col idxs
greole Nov 17, 2023
249a7d7
add statistics message
greole Nov 17, 2023
da367d0
compile unittests
greole Nov 17, 2023
dfccc49
fix formating
greole Nov 20, 2023
dfdbb9d
add libPstream
greole Nov 20, 2023
575e94e
add more link libs
greole Nov 20, 2023
49ae888
fix lib specs
greole Nov 20, 2023
bfc5e98
fix lib specs
greole Nov 20, 2023
d69701b
source OF
greole Nov 20, 2023
2f1d769
linked sys-openmpi libPsream
greole Nov 20, 2023
a463dae
source OF for unitTestBuild
greole Nov 20, 2023
4a10253
Update CMakeLists.txt
HendriceH Nov 17, 2023
8725113
Update CMakeLists.txt
HendriceH Nov 15, 2023
8f1ab5d
Update common.C
HendriceH Nov 16, 2023
d28aa40
build tests for different mpi versions
greole Nov 20, 2023
dd4c73d
add DL libs
greole Nov 20, 2023
3bdae8f
add cmake format target and format cmake files
greole Nov 20, 2023
8165ebb
clean up
greole Nov 20, 2023
b7f23fb
add cmake-format file
greole Nov 20, 2023
e5f09eb
deactivate unit test for now
greole Nov 21, 2023
a0f4670
Update common/common.C
HendriceH Nov 21, 2023
1d402e3
Update CMakeLists.txt
HendriceH Nov 21, 2023
0db5b8d
Update CMakeLists.txt
HendriceH Nov 21, 2023
de03f24
deactivate unit test for now
greole Nov 21, 2023
033778c
Link stdc++fs into OGL
HendriceH Nov 21, 2023
9a0ac1c
add common notation and scotch decomposition
greole Nov 21, 2023
34d8333
remove unit test dependency
greole Nov 21, 2023
a92ab41
Use CUDA_ARCHITECTURES=native for GPU detection
HendriceH Nov 21, 2023
5ad5234
Merge pull request #99 from HendriceH/aws_compile
greole Nov 22, 2023
4c2f65f
Merge branch 'refact/sparse_comm' into fix/non_unique_interface
greole Nov 22, 2023
95c5db3
use interface_iterator
greole Nov 22, 2023
3f53286
Merge pull request #98 from hpsim/fix/non_unique_interface
greole Nov 22, 2023
2376f66
format
greole Nov 22, 2023
c642000
check for TODO DONT MERGE instead of TODO FIXME
greole Nov 22, 2023
f4d9c41
exclude .github folder
greole Nov 22, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build-foam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Get Ginkgo checkout version
shell: bash
run: |
grep -A1 "set(GINKGO_CHECKOUT_VERSION" CMakeLists.txt|tail -n1|grep -o "[0-9a-z]*" > GINKGO_CHECKOUT_VERSION
grep -A1 "set(GINKGO_CHECKOUT_VERSION" CMakeLists.txt|tail -n1|grep -o "[0-9a-z\-]*" > GINKGO_CHECKOUT_VERSION
export GINKGO_CHECKOUT_VERSION=$(cat GINKGO_CHECKOUT_VERSION)
echo "GINKGO_CHECKOUT_VERSION=$GINKGO_CHECKOUT_VERSION" >> $GITHUB_ENV

Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ jobs:
clang-format-version: '13'
check-path: '.'
fallback-style: 'Mozilla' # optional
- name: check for todo fixme note
run: |
NTODOS="$(grep -r 'TODO FIXME' | wc -l)"
echo "Found $NTODOS TODO FIXME notes"
! grep -q -r "TODO FIXME"
4 changes: 2 additions & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Get Ginkgo checkout version
shell: bash
run: |
grep -A1 "set(GINKGO_CHECKOUT_VERSION" CMakeLists.txt|tail -n1|grep -o "[0-9a-z]*" > GINKGO_CHECKOUT_VERSION
grep -A1 "set(GINKGO_CHECKOUT_VERSION" CMakeLists.txt|tail -n1|grep -o "[0-9a-z\-]*" > GINKGO_CHECKOUT_VERSION
export GINKGO_CHECKOUT_VERSION=$(cat GINKGO_CHECKOUT_VERSION)
echo "GINKGO_CHECKOUT_VERSION=$GINKGO_CHECKOUT_VERSION" >> $GITHUB_ENV

Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Get Ginkgo checkout version
shell: bash
run: |
grep -A1 "set(GINKGO_CHECKOUT_VERSION" CMakeLists.txt|tail -n1|grep -o "[0-9a-z]*" > GINKGO_CHECKOUT_VERSION
grep -A1 "set(GINKGO_CHECKOUT_VERSION" CMakeLists.txt|tail -n1|grep -o "[0-9a-z\-]*" > GINKGO_CHECKOUT_VERSION
export GINKGO_CHECKOUT_VERSION=$(cat GINKGO_CHECKOUT_VERSION)
echo "GINKGO_CHECKOUT_VERSION=$GINKGO_CHECKOUT_VERSION" >> $GITHUB_ENV

Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if(NOT OGL_ALLOW_REFERENCE_ONLY)
endif()

set(GINKGO_CHECKOUT_VERSION
"4292ffdee"
"sparse-communicator"
CACHE STRING "Use specific version of ginkgo")

include(CheckIncludeFileCXX)
Expand Down Expand Up @@ -151,6 +151,7 @@ target_sources(
BaseWrapper/lduBase/GKOlduBase.C
BaseWrapper/CoupledLduBase/GKOCoupledLduBase.C
HostMatrix/HostMatrix.C
HostMatrix/HostMatrixFreeFunctions.C
Solver/CG/GKOCG.C
Solver/BiCGStab/GKOBiCGStab.C
#Solver / IR / GKOIR.C Solver / Multigrid / GKOMultigrid.C
Expand Down
2 changes: 1 addition & 1 deletion DevicePersistent/Base/Base.C
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe change Partition variable to something like locPartition to better reflect that it is a localized_partition?

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ defineTemplateTypeNameWithName(DevicePersistentBase<gko::LinOp>,

// typedef needed to avoid confusion with the comma separated template
// arguments as macro arguments
typedef gko::experimental::distributed::Partition<label, label> Partition;
typedef gko::experimental::distributed::localized_partition<label> Partition;
defineTemplateTypeNameWithName(DevicePersistentBase<Partition>,
"PersistentPartition");

Expand Down
7 changes: 6 additions & 1 deletion DevicePersistent/Base/Base.H
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ private:

const label verbose_;

const InitFunctor init_functor_;

// This needs to be a pointer so that it can be assigned
// during the constructor, since regIOobject needs arguments
// to be constructed
Expand All @@ -99,7 +101,8 @@ public:
: name_(name),
db_(db),
from_registry_{db.foundObject<regIOobject>(name_)},
verbose_(verbose)
verbose_(verbose),
init_functor_(f)
{
if (from_registry_) {
word msg = "reading " + name_ + " from registry";
Expand Down Expand Up @@ -149,6 +152,8 @@ public:

word get_name() const { return name_; }

const InitFunctor &get_init_functor() const { return init_functor_; }

const objectRegistry &get_db() const { return db_; }

bool get_stored() const { return from_registry_; }
Expand Down
Loading