Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions .github/workflows/github_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,13 @@ jobs:
run: |
export CI_ROOT=$GITHUB_WORKSPACE/apps
if [[ "$F77" == "ifx" ]] || [[ "$CC" == "icc" ]] || [[ "$CC" == "icx" ]]; then source ${{ matrix.oneapi }}/setvars.sh --force; fi
./travis/install-mpi.sh $CI_ROOT $MPI_IMPL
if [[ "$PORT" == "ofi" ]]; then ./travis/install-libfabric.sh $CI_ROOT; else true; fi
if [[ "$PORT" == "ofi" ]]; then
./travis/install-libfabric.sh $CI_ROOT
OFIYN=Y
else
OFIYN=N
fi
./travis/install-mpi.sh $CI_ROOT $MPI_IMPL $OFIYN
if [[ "$PORT" == "armci" ]]; then ./travis/install-armci-mpi.sh $CI_ROOT; else true; fi
if [[ "$USE_SICM" == "Y" ]]; then ./travis/install-sicm.sh $HOME/no_cache; else true; fi
- name: compile and test global arrays
Expand Down Expand Up @@ -268,6 +273,7 @@ jobs:
if [[ $MPI_IMPL == "openmpi" ]]; then
make F77=$F77 check-ga MPIEXEC="timeout 20m mpirun --allow-run-as-root -mca mpi_yield_when_idle 0 --oversubscribe -np $NPROCS" || true
else
export MPIR_CVAR_NOLOCAL=1
make F77=$F77 check-ga MPIEXEC="timeout 20m mpirun -np $NPROCS"
fi
fi
Expand Down
4 changes: 1 addition & 3 deletions global/testing/thread_perf_strided.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,10 +435,8 @@ int main(int argc, char * argv[])
offset = (m-tlo[0])*lld + (n-tlo[1]);
if (buf[offset] != m*dims[1]+n) {
arr_ok[id] = 0;
/*
printf("Read mismatch for [%d,%d] expected: %d actual: %d\n",
m,n,m*dims[1]+n,lld);
*/
m,n,m*dims[1]+n,buf[offset]);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions travis/build-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ then
fi

# Determine test name based on whether fortran was supported.
TEST_NAME=./global/testing/test.x
TEST_NAME=./global/testing/thread_perf_strided.x
if test -x $TEST_NAME
then
echo "Running fortran-based test"
Expand All @@ -178,7 +178,7 @@ if test "x$PORT" = "xmpi-pr"
then
mpirun -n 5 ${MAYBE_OVERSUBSCRIBE} ${TEST_NAME}
else
mpirun -n 4 ${MAYBE_OVERSUBSCRIBE} ${TEST_NAME}
MPIR_CVAR_NOLOCAL=1 mpirun -n 4 ${MAYBE_OVERSUBSCRIBE} ${TEST_NAME}
fi
if [ "$USE_CMAKE" = "Y" ] ; then
echo "skipping dra test when using cmake"
Expand Down
10 changes: 7 additions & 3 deletions travis/install-mpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ set -x
os=`uname`
TRAVIS_ROOT="$1"
MPI_IMPL="$2"

if [ -n "$3" ]; then
OFIYN="$3"
fi
MAKE_JNUM=2
#check if FC,F77 and CC are defined
if [[ -z "${CC}" ]]; then
Expand Down Expand Up @@ -44,7 +46,7 @@ case "$MPI_IMPL" in
brew install mpich || brew upgrade mpich || true
else
if [ ! -d "$TRAVIS_ROOT/mpich" ] || [ ! -x "$TRAVIS_ROOT/mpich/bin/mpicc" ]; then
MPI_VER=4.3.2
MPI_VER=5.0.2
wget --no-check-certificate http://www.mpich.org/static/downloads/"$MPI_VER"/mpich-"$MPI_VER".tar.gz
tar -xzf mpich-"$MPI_VER".tar.gz
cd mpich-"$MPI_VER"
Expand Down Expand Up @@ -74,8 +76,10 @@ case "$MPI_IMPL" in
icc -V
fi
CFLAGS_in="-O1 -w -fPIC"
if [[ $OFIYN == 'Y' ]]; then device_options="--with-device=ch3:nemesis" ; fi
if [[ $os == 'Darwin' ]]; then device_options="--with-device=ch3:nemesis" ; fi
# --disable-opencl since opencl detection generates -framework opencl on macos that confuses opencl
../configure CC="$CC" FC="$F77" F77="$F77" CFLAGS="$CFLAGS_in" FFLAGS="$FFLAGS_IN" --prefix=$TRAVIS_ROOT/mpich --with-device=ch3:nemesis --disable-shared --enable-static --disable-opencl pac_cv_have_float16=no
../configure CC="$CC" FC="$F77" F77="$F77" CFLAGS="$CFLAGS_in" FFLAGS="$FFLAGS_IN" --prefix=$TRAVIS_ROOT/mpich --disable-shared --enable-static --disable-opencl pac_cv_have_float16=no $device_options
make -j ${MAKE_JNUM}
make -j ${MAKE_JNUM} install
ls -Rlta $TRAVIS_ROOT/mpich/lib
Expand Down
Loading