Skip to content

Add kokkos and its simtbx/LS49 tests to Azure build #728

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

Merged
merged 16 commits into from
Mar 30, 2022
Merged

Add kokkos and its simtbx/LS49 tests to Azure build #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
797367f
Add kokkos and its simtbx/LS49 tests to Azure build
phyy-nx Jan 25, 2022
c3985d1
Debugging prints
phyy-nx Jan 26, 2022
6c8e028
Remove echo from kokkos SConscript
phyy-nx Jan 26, 2022
3c78da9
Typo
phyy-nx Jan 26, 2022
752529a
More debugging
phyy-nx Jan 26, 2022
60290ec
Remove debugging output
bkpoon Jan 27, 2022
0c87eff
Use 2 threads
bkpoon Jan 27, 2022
00e260c
CI: start building kokkos-kernels for XFEL CI
bkpoon Feb 4, 2022
3b082ce
Test lunus branch
bkpoon Mar 14, 2022
8a642ab
Find libgcc_s.so.1
bkpoon Mar 16, 2022
ea3067e
Revert "Find libgcc_s.so.1"
bkpoon Mar 17, 2022
02565c1
Enable kokkos on macOS
bkpoon Mar 17, 2022
4e0c07c
Enable OpenMP on macOS
bkpoon Mar 17, 2022
6bce39f
Revert "Enable OpenMP on macOS"
bkpoon Mar 30, 2022
47d8ce0
Revert "Enable kokkos on macOS"
bkpoon Mar 30, 2022
d04f8e1
Only run kokkos tests on linux
bkpoon Mar 30, 2022
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
2 changes: 1 addition & 1 deletion .azure-pipelines/xfel/download-source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
cd modules
git clone https://github.com/nksauter/LS49.git
git clone https://gitlab.com/cctbx/ls49_big_data.git
git clone https://github.com/lanl/lunus.git
git clone -b azure https://github.com/bkpoon/lunus.git
displayName: Download sources

- script: |
Expand Down
19 changes: 15 additions & 4 deletions .azure-pipelines/xfel/unix-conda-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ steps:
#conda create -y --offline -n $(PYTHON_VERSION) --file $(Pipeline.Workspace)/channel/env.txt
conda create -y -n $(PYTHON_VERSION) --file $(Pipeline.Workspace)/modules/dials/.conda-envs/$(OS).txt python=$(PYTHON_FULL_VERSION)
conda install -y -c conda-forge --no-deps -n $(PYTHON_VERSION) junit-xml
conda install -y -c conda-forge pandas distro -n $(PYTHON_VERSION)
conda install -y -c conda-forge cmake pandas distro -n $(PYTHON_VERSION)
displayName: Create conda environment

# build
Expand All @@ -78,7 +78,18 @@ steps:
conda activate $(PYTHON_VERSION)
cd $(Pipeline.Workspace)
rm -rf modules/boost
python bootstrap.py --builder=xfel --use-conda $CONDA_PREFIX --nproc=4 --config-flags="--enable_openmp_if_possible=True" --config-flags="--compiler=conda" --config-flags="--use_environment_flags" --config-flags="--enable_cxx11" --config-flags="--no_bin_python" --no-boost-src build
python bootstrap.py \
--builder=xfel \
--use-conda $CONDA_PREFIX \
--nproc=4 \
--config-flags="--enable_openmp_if_possible=True" \
--config-flags="--compiler=conda" \
--config-flags="--use_environment_flags" \
--config-flags="--enable_cxx11" \
--config-flags="--no_bin_python" \
--config-flags="--enable_kokkos" \
--no-boost-src \
build
if [ "$(OS)" = "linux" ]; then
cd build
source conda_setpaths.sh
Expand All @@ -98,8 +109,8 @@ steps:
libtbx.configure xfel_regression LS49 ls49_big_data
chmod +x $(Pipeline.Workspace)/modules/xfel_regression/merging_test_data/xfel_merge.sh
chmod +x $(Pipeline.Workspace)/modules/xfel_regression/merging_test_data/merge_thermo.csh
export OMP_NUM_THREADS=4
libtbx.run_tests_parallel module=uc_metrics module=simtbx module=xfel_regression module=LS49 nproc=4
export OMP_NUM_THREADS=2
libtbx.run_tests_parallel module=uc_metrics module=simtbx module=xfel_regression module=LS49 nproc=2
failOnStderr: false
displayName: Test

Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/xfel/unix-psana-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ steps:
source $(Pipeline.Workspace)/miniforge/etc/profile.d/conda.sh
conda env create -f $(Pipeline.Workspace)/modules/cctbx_project/xfel/conda_envs/psana_environment.yml
conda install -y -c conda-forge --no-deps -n psana_env junit-xml
conda install -y -c conda-forge pandas distro -n psana_env
conda install -y -c conda-forge cmake pandas distro -n psana_env
displayName: Create conda environment

# build
Expand Down
2 changes: 2 additions & 0 deletions simtbx/kokkos/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ kokkos_cxxflags = subprocess.check_output(
cwd=os.environ['KOKKOS_PATH'])
kokkos_cxxflags = kokkos_cxxflags.split(b'\n')
kokkos_cxxflags = kokkos_cxxflags[1].decode('utf8').split()
if kokkos_cxxflags and kokkos_cxxflags[0] == 'echo':
kokkos_cxxflags = [f.strip('"') for f in kokkos_cxxflags[1:]]
print('KOKKOS_CXXFLAGS:', kokkos_cxxflags)
print('='*79)

Expand Down
2 changes: 1 addition & 1 deletion simtbx/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
tst_list_parallel.append(par_tst)

tst_list_parallel += db_tst_list_onlyCuda
elif OPT.enable_kokkos:
elif OPT.enable_kokkos and sys.platform.startswith('linux'):
tst_list_parallel = [
["$D/nanoBragg/tst_gauss_argchk.py","CPU"], # tests CPU argchk optimization
"$D/kokkos/tst_kokkos_lib.py", # GPU in kokkos
Expand Down