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

Miscelaneous CI stuff #2223

Merged
merged 4 commits into from
May 13, 2020
Merged
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
30 changes: 0 additions & 30 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,33 +115,3 @@ jobs:
run: scripts/ci/gh-actions/run.sh build
- name: Test
run: scripts/ci/gh-actions/run.sh test

macos:
runs-on: ${{ matrix.os }}
env:
GH_YML_JOBNAME: ${{ matrix.jobname }}
GH_YML_OS: macOS

strategy:
fail-fast: false
matrix:
jobname: [
macos1015-xcode111-make ]
include:
- jobname: macos1015-xcode111-make
os: macos-10.15

steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup
run: scripts/ci/gh-actions/macos-setup.sh
- name: Update
run: scripts/ci/gh-actions/run.sh update
- name: Configure
run: scripts/ci/gh-actions/run.sh configure
- name: Build
run: scripts/ci/gh-actions/run.sh build
- name: Test
run: scripts/ci/gh-actions/run.sh test
16 changes: 0 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
sudo: false
language: cpp
dist: xenial
addons:
apt:
packages:
- libmpich-dev
before_install:
- pushd ${HOME}
- wget http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
- popd
install:
- pushd ${HOME}
- tar -xf clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
- export PATH="${PWD}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin:${PATH}"
- export PATH="${PWD}/cmake-3.7.2-Linux-x86_64/bin:${PATH}"
- popd
- pip install --user flake8
- git config --global clangformat.binary ${HOME}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin/clang-format
env:
matrix:
- BUILD_MATRIX_ENTRY=format
Expand Down
9 changes: 7 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,13 @@ else()
endif()
unset(BUILD_TESTING)
option(ADIOS2_BUILD_TESTING "Build the ADIOS2 testing tree"
${ADIOS2_BUILD_TESTING_DEFAULT})

${ADIOS2_BUILD_TESTING_DEFAULT})

cmake_dependent_option(ADIOS2_RUN_MPI_MPMD_TESTS
"Enable the parallel MPMD tests" ON
"ADIOS2_BUILD_TESTING;ADIOS2_HAVE_MPI" OFF)
mark_as_advanced(ADIOS2_RUN_MPMD_TESTS)

include(CTest)
set(BUILD_TESTING ${ADIOS2_BUILD_TESTING})
if(BUILD_TESTING)
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:
matrix:
macos1014_xcode103_ninja:
hostImage: 'macOS-10.14'
# macos1014_xcode103_openmpi_make:
# hostImage: 'macOS-10.14'
macos1015_xcode111_make:
hostImage: 'macOS-10.15'

pool:
vmImage: $[ variables['hostImage'] ]
Expand Down
11 changes: 11 additions & 0 deletions scripts/travis/run-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ then
exit 1
fi

# Install clang-format
pushd ${HOME}
wget http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
tar -xf clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz
export PATH="${PWD}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin:${PATH}"
git config --global clangformat.binary ${HOME}/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-16.04/bin/clang-format
popd

# Install flake8
pip install --user flake8

cd ${SOURCE_DIR}

# Check C and C++ code with clang-format
Expand Down
4 changes: 2 additions & 2 deletions testing/adios2/engine/staging-common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ endforeach()
#
# Setup tests for InSituMPI engine
#
if(ADIOS2_HAVE_MPI)
if(ADIOS2_HAVE_MPI AND ADIOS2_RUN_MPMD_TESTS)
set (SIMPLE_IMPI_TESTS "1x1;TimeoutOnOpen;1x1.Modes;1x1.Attrs;1x1.Local;1x1.SharedNothing;1x1.SharedIO;1x1.SharedVar;1x1.SharedNothingSync;1x1.SharedIOSync;1x1.SharedVarSync;2x1.SharedNothing;2x1.SharedIO;2x1.SharedVar;2x1.SharedNothingSync;2x1.SharedIOSync;2x1.SharedVarSync")
set (INSITU_TESTS ${SIMPLE_IMPI_TESTS} ${SIMPLE_FORTRAN_TESTS} ${SIMPLE_MPI_TESTS} ${SIMPLE_ZFP_TESTS})
# Tests that don't work for InSitu
Expand Down Expand Up @@ -217,7 +217,7 @@ if(ADIOS2_HAVE_MPI)
endforeach()
endif()

if(ADIOS2_HAVE_SSC)
if(ADIOS2_HAVE_SSC AND ADIOS2_RUN_MPMD_TESTS)
set (SSC_BASE_TESTS "1x1;1x1.Attrs;2x1;1x2;2x1ZeroDataVar;2x1ZeroDataR64;3x5;5x3;3x5LockGeometry;TimeoutOnOpen")
set (SSC_TESTS ${SIMPLE_FORTRAN_TESTS} ${SIMPLE_MPI_FORTRAN_TESTS} ${SSC_BASE_TESTS})
foreach(test ${SSC_TESTS})
Expand Down
3 changes: 3 additions & 0 deletions testing/adios2/engine/staging-common/TestSupp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ function(add_common_test basename engine)
remove_engine_params_placeholder(command "${command}")
separate_arguments(command)
list(INSERT command 2 "${engine}" "${testname}")
if(NOT ADIOS2_RUN_MPMD_TESTS)
list(APPEND command "--disable_mpmd")
endif()
add_test(NAME ${testname} COMMAND ${command})
if(testname MATCHES "([1-9][0-9]*)x([1-9][0-9]*)")
math(EXPR nprocs "${CMAKE_MATCH_1} + ${CMAKE_MATCH_2}")
Expand Down
4 changes: 4 additions & 0 deletions testing/adios2/engine/staging-common/run_test.py.gen.in
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ parser.add_argument('--max_readers', '-mr', type=int, default=1)
parser.add_argument('--duration', type=int, default=60)
parser.add_argument('--interval', type=int, default=5)
parser.add_argument('--reader_delay', '-rd', type=int, default=0)
parser.add_argument('--disable_mpmd', action='store_true')
parser.add_argument('--test_protocol', '-tp', choices=[
'simple', 'kill_readers', 'one_client',
'kill_writer'], default='simple')
Expand Down Expand Up @@ -342,6 +343,9 @@ if args.reader_delay != 0:
print("TestDriver: Reader delay setting MPMD false\n")
mpmd_possible = False

if args.disable_mpmd:
mpmd_possible = False

test_setup(args.filename)
atexit.register(test_teardown, args.filename)
sys.stdout.flush()
Expand Down
30 changes: 16 additions & 14 deletions testing/examples/heatTransfer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@ if(ADIOS2_HAVE_ZFP)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestBPFileMx1_zfp.cmake)
endif()

if(ADIOS2_HAVE_SST)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMx1.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMx1.cmake)
if(ADIOS2_SST_HAVE_LIBFABRIC)
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPRDMAMxN.cmake)
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSRDMAMxN.cmake)
if(ADIOS2_RUN_MPMD_TESTS)
if(ADIOS2_HAVE_SST)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPMx1.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSMx1.cmake)
if(ADIOS2_SST_HAVE_LIBFABRIC)
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTBPRDMAMxN.cmake)
# include(${CMAKE_CURRENT_SOURCE_DIR}/TestSSTFFSRDMAMxN.cmake)
endif()
endif()
endif()

include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMx1.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxM.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMxN.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/TestInsituMPIMx1.cmake)
endif()
Loading