Skip to content

Commit

Permalink
Parrsb fixes and cleanup v4 (#9) (#72)
Browse files Browse the repository at this point in the history
  • Loading branch information
thilinarmtb authored Nov 7, 2023
1 parent 9841bcf commit 5709372
Show file tree
Hide file tree
Showing 45 changed files with 2,566 additions and 5,496 deletions.
17 changes: 3 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
shell: bash
run: |
export PARRSB_RSB_ALGO=0
export PARRSB_VERBOSE_LEVEL=2
cp ${EXAMPLESDIR}/genmap ${CIDIR}/${{ matrix.test }}
cd ${CIDIR}/${{ matrix.test }}
Expand All @@ -70,6 +71,7 @@ jobs:
run: |
export PARRSB_RSB_ALGO=1
export PARRSB_RSB_MG_FACTOR=2
export PARRSB_VERBOSE_LEVEL=2
cp ${EXAMPLESDIR}/genmap ${CIDIR}/${{ matrix.test }}
cd ${CIDIR}/${{ matrix.test }}
Expand All @@ -83,20 +85,7 @@ jobs:
run: |
export PARRSB_RSB_ALGO=1
export PARRSB_RSB_MG_FACTOR=4
cp ${EXAMPLESDIR}/genmap ${CIDIR}/${{ matrix.test }}
cd ${CIDIR}/${{ matrix.test }}
tol=(`cat test.txt | grep tol`); tol=${tol[2]}
${MPIEXE} -np ${{ matrix.np }} ./genmap --mesh ${{ matrix.test }} \
--tol=${tol} --dump=0 --test=1
- name: genmap-mg-factor-4-smooth
if: always()
shell: bash
run: |
export PARRSB_RSB_ALGO=1
export PARRSB_RSB_MG_FACTOR=4
export PARRSB_RSB_MG_SMOOTH_AGGREGATION=1
export PARRSB_VERBOSE_LEVEL=2
cp ${EXAMPLESDIR}/genmap ${CIDIR}/${{ matrix.test }}
cd ${CIDIR}/${{ matrix.test }}
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/coarse.yml

This file was deleted.

74 changes: 0 additions & 74 deletions .github/workflows/ilu.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .github/workflows/ilu0.m

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/iluc.m

This file was deleted.

10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CC ?= mpicc
CFLAGS ?=
CFLAGS ?= -Wall -Wextra -Wpedantic -Wno-unused-function -Wno-unused-parameter -std=c99
LDFLAGS ?=
DEBUG ?= 0
MPI ?= 1
Expand All @@ -8,6 +8,7 @@ SYNC_BY_REDUCTION ?= 1
BLAS ?= 0
BLASDIR ?=
BLASFLAGS ?= -lblas -llapack
GSLIBPATH ?=

########################## Don't touch what follows ###########################
ifeq ($(GSLIBPATH),)
Expand All @@ -19,9 +20,10 @@ SRCROOT := $(realpath $(patsubst %/,%,$(dir $(MKFILEPATH))))
SRCDIR = $(SRCROOT)/src
EXAMPLEDIR = $(SRCROOT)/examples
BUILDROOT = $(SRCROOT)/build
INSTALLROOT = $(BUILDROOT)/install
ifneq ($(strip $(DESTDIR)),)
INSTALLROOT = $(realpath $(DESTDIR))
ifneq (,$(strip $(DESTDIR)))
INSTALLROOT = $(DESTDIR)
else
INSTALLROOT = $(SRCROOT)/install
endif

SRCS = $(wildcard $(SRCDIR)/*.c)
Expand Down
153 changes: 0 additions & 153 deletions examples/coarse.c

This file was deleted.

2 changes: 1 addition & 1 deletion examples/genmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
parrsb_check_error(part == NULL, comm);

parrsb_options options = parrsb_default_options;
err = parrsb_part_mesh(part, NULL, vl, coord, nelt, nv, options, comm);
err = parrsb_part_mesh(part, vl, coord, NULL, nelt, nv, &options, comm);
parrsb_check_error(err, comm);

// Redistribute data based on identified partitions
Expand Down
Loading

0 comments on commit 5709372

Please sign in to comment.