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.

Sign up for GitHub

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

Jump to bottom

Issue #1627: Re-generate the ADIOS numpy wrappers on the fly #1635

Merged
merged 3 commits into from
Dec 13, 2022
Merged

Issue #1627: Re-generate the ADIOS numpy wrappers on the fly #1635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d16fe5a
Issue #1627: Re-generate the ADIOS numpy wrappers on the fly
martin-g Dec 12, 2022
40dc5aa
Issue #1627: Add an entry for testing ADIOS in CI
martin-g Dec 13, 2022
8c4f192
ci: prepare adios tests for running in GitHub
martin-g Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions components/io-libs/adios/SPECS/adios.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ BuildRequires: lustre-lite
Requires: lustre-client%{PROJ_DELIM}
%endif
BuildRequires: %{python_prefix}-numpy-%{compiler_family}%{PROJ_DELIM}

BuildRequires: %{python_prefix}-mpi4py-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
BuildRequires: %{python_prefix}-Cython%{PROJ_DELIM}

%if 0%{?sles_version} || 0%{?suse_version}
# define fdupes, clean up rpmlint errors
Expand Down Expand Up @@ -192,13 +193,15 @@ export PATH=$(pwd):$PATH
module load openblas
%endif
module load %{python_module_prefix}numpy
module load %{python_module_prefix}mpi4py
export CFLAGS="-I$NUMPY_DIR$PPATH/numpy/core/include -I$(pwd)/src/public -L$(pwd)/src"
export CFLAGS="$CFLAGS -I$MPI_DIR/include"
pushd wrappers/numpy
mkdir .bin
ln -s /usr/bin/python3 .bin/python
export PATH="$PWD/.bin:$PATH"
make MPI=y python
rm -f adios.cpp adios_mpi.cpp
make CYTHON=y MPI=y python

#%{python_prefix} setup.py install --prefix="%buildroot%{install_path}/python"
python3 setup.py install --prefix="%buildroot%{install_path}/python"
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/setup_slurm_and_run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ export SIMPLE_CI=1

# Always running at least with '--enable-modules'. No need to check for
# an empty TESTS array.
su "${USER}" -l -c "cd ${PWD}/tests; ./bootstrap; ./configure --disable-all --enable-modules ${TESTS[*]}; make check"
su "${USER}" -l -c "cd ${PWD}/tests; ./bootstrap; ./configure --disable-all --enable-modules --with-mpi-families='openmpi4 mpich' ${TESTS[*]}; make check"
4 changes: 4 additions & 0 deletions tests/ci/spec_to_test_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
'easybuild',
'gcc-c++',
],
'components/io-libs/adios/SPECS/adios.spec': [
'adios',
'openmpi4-gnu12-ohpc mpich-gnu12-ohpc'
],
'components/io-libs/hdf5/SPECS/hdf5.spec': [
'hdf5',
'zlib-devel'
Expand Down
6 changes: 5 additions & 1 deletion tests/libs/adios/tests/rm_execution
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ rm=$RESOURCE_MANAGER
testname="libs/ADIOS"

NODES=2
TASKS=8
if [ -z "$SIMPLE_CI" ]; then
TASKS=2
else
TASKS=8
fi

@test "[$testname] MPI C binary runs under resource manager ($rm/$LMOD_FAMILY_COMPILER/$LMOD_FAMILY_MPI)" {
binary=arrays_write
Expand Down