Skip to content

Commit

Permalink
Merge pull request #7167 from raffenet/move-mydef
Browse files Browse the repository at this point in the history
build: Move benchmark generation to test/mpi/autogen.sh

Approved-by: Hui Zhou
  • Loading branch information
hzhou authored Oct 16, 2024
2 parents c88cc63 + ec4cc89 commit 3ce0e24
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
11 changes: 0 additions & 11 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ do_hydra=yes
do_romio=yes
do_pmi=yes
do_doc=no
do_mydef=yes

yaksa_depth=

Expand Down Expand Up @@ -537,14 +536,6 @@ fn_json_gen() {
echo "done"
}

fn_mydef() {
MYDEF_BOOT=$PWD/modules/mydef_boot
export PATH=$MYDEF_BOOT/bin:$PATH
export PERL5LIB=$MYDEF_BOOT/lib/perl5
export MYDEFLIB=$MYDEF_BOOT/lib/MyDef
(cd test/mpi/bench && ./autogen.sh)
}

# internal
_patch_libtool() {
_file=$1
Expand Down Expand Up @@ -1111,5 +1102,3 @@ fn_build_configure
fn_ch4_api

fn_json_gen

fn_mydef
14 changes: 14 additions & 0 deletions test/mpi/autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@ check_copy() {
fi
}

generate_benchmarks() {
MYDEF_BOOT=$PWD/../../modules/mydef_boot
if test -d $MYDEF_BOOT ; then
echo "Generating benchmark tests"
export PATH=$MYDEF_BOOT/bin:$PATH
export PERL5LIB=$MYDEF_BOOT/lib/perl5
export MYDEFLIB=$MYDEF_BOOT/lib/MyDef
(cd bench && ./autogen.sh)
fi
}

check_copy version.m4 ../../maint/version.m4
check_copy confdb ../../confdb
check_copy dtpools/confdb ../../confdb
Expand All @@ -78,6 +89,9 @@ if test ! -e include/mtest_mpix.h ; then
touch include/mtest_mpix.h
fi

# Generate the benchmark tests
generate_benchmarks

echo "Running autoreconf in dtpools"
(cd dtpools && autoreconf -ivf)

Expand Down

0 comments on commit 3ce0e24

Please sign in to comment.