[SyneRBI/SIRF-SuperBuild] update CIL and CCPi-Regularisation version and reinstate tests (PR #897)
Edoardo Pasca
Bump CIL and CCPi-Regularisation-Toolkit versions for PSMR24 training school
- closes #832
You can view, comment on, or merge this pull request online at:
https://github.com/SyneRBI/SIRF-SuperBuild/pull/897
Commit Summary
- 687a1de update CIL and CCPi-Regularisation version and reinstate tests
File Changes
(3 files)
- M SuperBuild.cmake (2)
- M SuperBuild/External_CIL.cmake (4)
- M version_config.cmake (6)
Patch Links:
- https://github.com/SyneRBI/SIRF-SuperBuild/pull/897.patch
- https://github.com/SyneRBI/SIRF-SuperBuild/pull/897.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- 90635a4 update build command
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- dc2a4f1 update SIRF version
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- 7d8384d test if ROOT errors are due to GCC 11
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans commented on this pull request.
Is there anything here for me to check?
Obviously, merge the SIRF PR first and set SIRF_TAG accordingly
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@KrisThielemans do you have any clue onto why ROOT fails to build with these changes?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- a2a1994 update SIRF tags
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
[ 0%] Performing install step for 'XROOTD'
CMake Error at /home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/ROOT/build/builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-install-Release.cmake:49 (message):
Command failed: 1
'/usr/local/bin/cmake' '-Dmake=' '-Dconfig=' '-P' '/home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/ROOT/build/builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-install-Release-impl.cmake'
See also
/home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/ROOT/build/builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-install-*.log
Luckily, we do upload logs as an artefact (visible in the Summary of the Action). Checking the install-err.log:
``
gmake[7]: *** read jobs pipe: Bad file descriptor. Stop.
gmake[7]: *** Waiting for unfinished jobs....
gmake[6]: *** [Makefile:136: all] Error 2
We have had this before https://github.com/root-project/root/issues/14520 and it auto-disappeared.
Presumably our build is overload the MS network... Sadly, I'm not sure what can be done about it. I suppose we could modify the job to use a packaged ROOT as opposed to building it ourselves, and have one that does build it, but is allowed to fail.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
Here's what we do in STIR GHA
https://github.com/UCL/STIR/blob/feb6d85eadb392f5b8278d3b97ae2ee67ca439d9/.github/workflows/build-test.yml#L260-L264
You'd then have to say USE_SYSTEM_ROOT=ON. Of course, it would make sense to put the download in the docker scripts. Not 100% sure about the source .../thisroot.sh though.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- e3d4115 update Changelog
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
Does this mean we will not test BUILD_ROOT=ON rather USE_SYSTEM_ROOT=ON on the CI?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
yes, I think it'd be nice to have one job where we build it ourselves, but allow failure, as I wrote.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- 4b19647 install cil from source if BUILD_CIL=ON and not from conda
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- 711ce31 install CIL via conda if BUILD_CIL=OFF
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl requested changes on this pull request.
In Dockerfile:
> @@ -111,7 +111,7 @@ COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/ /opt/S
# install {SIRF-Exercises,CIL-Demos}
COPY docker/user_demos.sh /opt/scripts/
-RUN bash /opt/scripts/user_demos.sh \
+RUN BUILD_CIL="${BUILD_CIL}" bash /opt/scripts/user_demos.sh \
BUILD_CIL isn't available here as it's a different stage (FROM) in teh Dockerfile
-RUN BUILD_CIL="${BUILD_CIL}" bash /opt/scripts/user_demos.sh \
+RUN bash /opt/scripts/user_demos.sh \
> + # do not install CIL from conda if BUILD_CIL is set
+ if test "${BUILD_CIL:-0}" != 0; then
⬇️ Suggested change
- # do not install CIL from conda if BUILD_CIL is set
- if test "${BUILD_CIL:-0}" != 0; then
+ # do not install CIL from conda if SuperBuild already built it
+ if test "$(conda list '^cil$')" != "[]"; then
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 1 commit.
- ed82ee5 skip conda install cil if unneeded
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
> @@ -22,7 +22,12 @@ if [ "$PYTHON" = "miniconda" ]; then
# delete GPU deps
sed -r -e '/^\s*- (astra-toolbox|tigre).*/d' -e '/^\s*- \S+.*#.*GPU/d' environment.yml > environment-sirf.yml
fi
- conda env update --file environment-sirf.yml
+ # do not install CIL from conda if SuperBuild already built it
+ if test "$(conda list '^cil$')" != "[]"; then
+ # delete CIL package from the environment file
+ sed -r -i -e '/^\s*- (cil).*/d' environment-sirf.yml
+ fi
+ conda env update --file environment-sirf.yml -v
up to you if this is needed, idk.
⬇️ Suggested change- conda env update --file environment-sirf.yml -v + conda env update --file environment-sirf.yml
> -set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/vais-ral/CCPi-Regularisation-Toolkit) -set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "71f8d304d804b54d378f0ed05539f01aaaf13758") +set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit) +set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "fix_3D_regularisers") # fix_
incomplete # comment here?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
> @@ -22,7 +22,12 @@ if [ "$PYTHON" = "miniconda" ]; then
# delete GPU deps
sed -r -e '/^\s*- (astra-toolbox|tigre).*/d' -e '/^\s*- \S+.*#.*GPU/d' environment.yml > environment-sirf.yml
fi
- conda env update --file environment-sirf.yml
+ # do not install CIL from conda if SuperBuild already built it
+ if test "$(conda list '^cil$')" != "[]"; then
mea culpa
⬇️ Suggested change- if test "$(conda list '^cil$')" != "[]"; then + if test "$(conda list '^cil$' --json)" != "[]"; then
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 2 commits.
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- 1466410 removed partial comment
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl requested changes on this pull request.
fix bugs
In Dockerfile:
> COPY docker/requirements.yml /opt/scripts/ # https://jupyter-docker-stacks.readthedocs.io/en/latest/using/common.html#conda-environments # https://github.com/TomographicImaging/CIL/blob/master/Dockerfile RUN if test "$BUILD_GPU" != 0; then \ sed -ri 's/^(\s*)#\s*(- \S+.*#.*GPU.*)$/\1\2/' /opt/scripts/requirements.yml; \ fi \ + && if test "$BUILD_CIL" != 0; then \⬇️ Suggested change
- && if test "$BUILD_CIL" != 0; then \ + && if test "$BUILD_CIL" != "OFF"; then \
> @@ -22,7 +22,16 @@ if [ "$PYTHON" = "miniconda" ]; then
# delete GPU deps
sed -r -e '/^\s*- (astra-toolbox|tigre).*/d' -e '/^\s*- \S+.*#.*GPU/d' environment.yml > environment-sirf.yml
fi
- conda env update --file environment-sirf.yml
+ # do not install CIL from conda if BUILD_CIL is set
+ if test "${BUILD_CIL:-0}" != 0; then
⬇️ Suggested change
- if test "${BUILD_CIL:-0}" != 0; then
+ if test "${BUILD_CIL:-OFF}" != "OFF"; then
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 1 commit.
- 6a0bf4b fix BUILD_CIL value handling
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 2 commits.
- a0e8871 update test to look for OFF
- d6ab950 Merge branch 'bump_cil_modules' of github.com:SyneRBI/SIRF-SuperBuild into bump_cil_modules
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- 0caafd3 updated SIRF and CIL tags
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
Please merge master to get the correct STIR version.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- e6a0c65 Merge remote-tracking branch 'origin' into bump_cil_modules
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans pushed 1 commit.
- c8f6e65 Merge branch 'master' into bump_cil_modules
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@paskino @casperdcl this is ready to merge from my perspective. Please ahead, and then tag.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
IIRC @paskino found another bug in this PR
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
In Dockerfile:
> @@ -126,4 +132,6 @@ ENV GADGETRON_RELAY_HOST="0.0.0.0"
# run gadgetron in the background before start-notebook.py
COPY --link --chown=${NB_USER} docker/start-gadgetron-notebook.sh /opt/scripts/
+# COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/lib /opt/conda/lib
+COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/bin/env_sirf.sh /opt/conda/etc/conda/activate.d
I'm not sure this is ideal...
- server overrides
$HOME: ok - server doesn't override
$HOME:env_sirf.shgets sourced twice (once by$HOME/.bashrc, once byconda/activate.d/*)
Perhaps we should change env_sirf.sh to do nothing if it's already been sourced once?
test -n "$SIRF_ENV_SOURCED" && exit 0; SIRF_ENV_SOURCED=1 # pragma once
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 1 commit.
- da65e19 bash: source once
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
In Dockerfile:
> @@ -126,4 +132,6 @@ ENV GADGETRON_RELAY_HOST="0.0.0.0"
# run gadgetron in the background before start-notebook.py
COPY --link --chown=${NB_USER} docker/start-gadgetron-notebook.sh /opt/scripts/
+# COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/lib /opt/conda/lib
+COPY --from=build --link --chown=${NB_USER} /opt/SIRF-SuperBuild/INSTALL/bin/env_sirf.sh /opt/conda/etc/conda/activate.d
added to da65e19
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans commented on this pull request.
In env_sirf.sh.in:
> @@ -2,6 +2,7 @@ # Use it like this # source /path/to/whereever/env_ccppetmr.sh # Preferably add this line to your .basrhc, .profile or whatever file is appropriate for your shell +test -n "$SIRF_ENV_SOURCED" && return; SIRF_ENV_SOURCED=1 # pragma once
this is problematic outside docker/jupyterhub. Some of us have different versions of the SB and switch between them by sourcing different .sh files. This would no longer work.
Of course, it'd be better if the script wouldn't append/prepend to PATH etc if it's already the latest. Checking if env_sirf.sh is in the PATH and if so, it's in `@SyneRBI_INSTALL@/bin could help, but it doesn't seem to be so easy to do.
Why is it a problem?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
In env_sirf.sh.in:
> @@ -2,6 +2,7 @@ # Use it like this # source /path/to/whereever/env_ccppetmr.sh # Preferably add this line to your .basrhc, .profile or whatever file is appropriate for your shell +test -n "$SIRF_ENV_SOURCED" && return; SIRF_ENV_SOURCED=1 # pragma once
Ah I see makes sense.
Probably best to revert and put up with PATH cruft
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans commented on this pull request.
In env_sirf.sh.in:
> @@ -2,6 +2,7 @@ # Use it like this # source /path/to/whereever/env_ccppetmr.sh # Preferably add this line to your .basrhc, .profile or whatever file is appropriate for your shell +test -n "$SIRF_ENV_SOURCED" && return; SIRF_ENV_SOURCED=1 # pragma once
yes please. we can always fix that later (TM)
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
In env_sirf.sh.in:
> @@ -2,6 +2,7 @@ # Use it like this # source /path/to/whereever/env_ccppetmr.sh # Preferably add this line to your .basrhc, .profile or whatever file is appropriate for your shell +test -n "$SIRF_ENV_SOURCED" && return; SIRF_ENV_SOURCED=1 # pragma once
-test -n "$SIRF_ENV_SOURCED" && return; SIRF_ENV_SOURCED=1 # pragma once
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 1 commit.
- 4f88a98 revert one line
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino commented on this pull request.
> @@ -161,10 +161,10 @@ set(DEFAULT_JSON_TAG v3.11.3) # CCPi CIL # minimum supported version of CIL supported is > 22.1.0 or from commit a6062410028c9872c5b355be40b96ed1497fed2a set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL) -set(DEFAULT_CIL_TAG db5a2a6cd3bddfbbf53e65f0549ac206096e5b44) # 13 Feb 2024 +set(DEFAULT_CIL_TAG 501726d8f09c16faef19ceb69b85c212db2eeca6) # 16 May 2024⬇️ Suggested change
-set(DEFAULT_CIL_TAG 501726d8f09c16faef19ceb69b85c212db2eeca6) # 16 May 2024 +set(DEFAULT_CIL_TAG ccf17f393ba911d13b74f2327779dde030098fe6) # 16 May 2024
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino commented on this pull request.
> @@ -161,10 +161,10 @@ set(DEFAULT_JSON_TAG v3.11.3) # CCPi CIL # minimum supported version of CIL supported is > 22.1.0 or from commit a6062410028c9872c5b355be40b96ed1497fed2a set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL) -set(DEFAULT_CIL_TAG db5a2a6cd3bddfbbf53e65f0549ac206096e5b44) # 13 Feb 2024 +set(DEFAULT_CIL_TAG 501726d8f09c16faef19ceb69b85c212db2eeca6) # 16 May 2024⬇️ Suggested change
-set(DEFAULT_CIL_TAG 501726d8f09c16faef19ceb69b85c212db2eeca6) # 16 May 2024 +set(DEFAULT_CIL_TAG ccf17f393ba911d13b74f2327779dde030098fe6) # 28 May 2024
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
waiting for
- TomographicImaging/CCPi-Regularisation-Toolkit#205
Then update the tag for the CCPi-Regularisation in theversion_config.cmakeand merge
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl requested changes on this pull request.
I merged TomographicImaging/CCPi-Regularisation-Toolkit#205 and released it as v24.0.1... I presume you manually upload it to conda -c ccpi?
In CHANGES.md:
> - SIRF: v3.7.0 + - CIL: 501726d8f09c16faef19ceb69b85c212db2eeca6 # 16 May 2024 + - CCPi-Regularisation-Toolkit: fix_3D_regularisers branch⬇️ Suggested change
- - CCPi-Regularisation-Toolkit: fix_3D_regularisers branch + - CCPi-Regularisation-Toolkit: v24.0.1
> -set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/vais-ral/CCPi-Regularisation-Toolkit) -set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "71f8d304d804b54d378f0ed05539f01aaaf13758") +set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit) +set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "fix_3D_regularisers")⬇️ Suggested change
-set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "fix_3D_regularisers") +set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "v24.0.1")
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Edoardo Pasca
@paskino pushed 1 commit.
- 7a0ac56 update to newest CCPi code versions
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@KrisThielemans requested changes on this pull request.
tiny change. then merge!
In Dockerfile:
> @@ -99,7 +104,7 @@ RUN apt update -qq && apt install -yq --no-install-recommends \ && mkdir -p /usr/share/X11/xkb \ && test -e /usr/bin/X || ln -s /usr/bin/Xorg /usr/bin/X -RUN echo 'test -z "$OMP_NUM_THREADS" && export OMP_NUM_THREADS=$(python -c "import multiprocessing as mc; print(mc.cpu_count() // 2)")' > /usr/local/bin/before-notebook.d/omp_num_threads.sh +RUN echo 'test -z "$OMP_NUM_THREADS" && export OMP_NUM_THREADS=$(python -c "import multiprocessing as mc; print(mc.cpu_count() - 2)")' > /usr/local/bin/before-notebook.d/omp_num_threads.sh
I suggest we add a max(1,) here, just in case...
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
In Dockerfile:
> @@ -99,7 +104,7 @@ RUN apt update -qq && apt install -yq --no-install-recommends \ && mkdir -p /usr/share/X11/xkb \ && test -e /usr/bin/X || ln -s /usr/bin/Xorg /usr/bin/X -RUN echo 'test -z "$OMP_NUM_THREADS" && export OMP_NUM_THREADS=$(python -c "import multiprocessing as mc; print(mc.cpu_count() // 2)")' > /usr/local/bin/before-notebook.d/omp_num_threads.sh +RUN echo 'test -z "$OMP_NUM_THREADS" && export OMP_NUM_THREADS=$(python -c "import multiprocessing as mc; print(mc.cpu_count() - 2)")' > /usr/local/bin/before-notebook.d/omp_num_threads.sh
-RUN echo 'test -z "$OMP_NUM_THREADS" && export OMP_NUM_THREADS=$(python -c "import multiprocessing as mc; print(mc.cpu_count() - 2)")' > /usr/local/bin/before-notebook.d/omp_num_threads.sh +RUN echo 'test -z "$OMP_NUM_THREADS" && export OMP_NUM_THREADS=$(python -c "import multiprocessing as mc; print(max(1, mc.cpu_count() - 2))")' > /usr/local/bin/before-notebook.d/omp_num_threads.sh
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl approved this pull request.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 1 commit.
- bd0f090 min 1 thread
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Kris Thielemans
@casperdcl @paskino please merge and tag
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl requested changes on this pull request.
> @@ -22,6 +22,15 @@ if [ "$PYTHON" = "miniconda" ]; then
# delete GPU deps
sed -r -e '/^\s*- (astra-toolbox|tigre).*/d' -e '/^\s*- \S+.*#.*GPU/d' environment.yml > environment-sirf.yml
fi
+ # do not install CIL from conda if BUILD_CIL is set
+if test "${BUILD_CIL:-OFF}" != "OFF"; then
+ # delete CIL package from the environment file
+ echo "Deleting CIL from the environment file BUILD_CIL is set to >${BUILD_CIL}<"
+ sed -r -i -e '/^\s*- (cil).*/d' environment-sirf.yml
Isn't this better now @paskino ?
⬇️ Suggested change- sed -r -i -e '/^\s*- (cil).*/d' environment-sirf.yml + sed -r -i -e '/# cil/d' environment-sirf.yml⬇️ Suggested change
- - CIL: 501726d8f09c16faef19ceb69b85c212db2eeca6 # 16 May 2024 + - CIL: ccf17f393ba911d13b74f2327779dde030098fe6 # 28 May 2024
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl commented on this pull request.
> @@ -22,6 +22,15 @@ if [ "$PYTHON" = "miniconda" ]; then
# delete GPU deps
sed -r -e '/^\s*- (astra-toolbox|tigre).*/d' -e '/^\s*- \S+.*#.*GPU/d' environment.yml > environment-sirf.yml
fi
+ # do not install CIL from conda if BUILD_CIL is set
+if test "${BUILD_CIL:-OFF}" != "OFF"; then
+ # delete CIL package from the environment file
+ echo "Deleting CIL from the environment file BUILD_CIL is set to >${BUILD_CIL}<"
+ sed -r -i -e '/^\s*- (cil).*/d' environment-sirf.yml
Oh actually it applies to https://github.com/SyneRBI/SIRF-Exercises/blob/master/environment.yml, in wguch case there's no cil-data, right?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
@casperdcl pushed 1 commit.
- e899666 Update CHANGES.md
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
Still some failing tests @paskino ...
gcc-9:
====================================================================== ERROR: test_TVdenoisingMR (test_SIRF.TestGradientMR_2D) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/sources/CIL/Wrappers/Python/test/test_SIRF.py", line 263, in test_TVdenoisingMR fista.run(verbose=0) File "/home/runner/install/python/cil/optimisation/algorithms/Algorithm.py", line 240, in run for _ in zip(range(self.iteration, self.iteration + iterations), self): File "/home/runner/install/python/cil/optimisation/algorithms/Algorithm.py", line 108, in __next__ self.update() File "/home/runner/install/python/cil/optimisation/algorithms/FISTA.py", line 295, in update self.f.gradient(self.y, out=self.x) File "/home/runner/install/python/cil/optimisation/functions/Function.py", line 480, in gradient res *= self.scalar TypeError: unsupported operand type(s) for *=: 'NoneType' and 'float' ---------------------------------------------------------------------- ====================================================================== ERROR: test_CPU_regularisers (unittest.loader._FailedTest) ---------------------------------------------------------------------- ImportError: Failed to import test module: test_CPU_regularisers Traceback (most recent call last): File "/opt/hostedtoolcache/Python/3.10.12/x64/lib/python3.10/unittest/loader.py", line 436, in _find_test_path module = self._get_module_from_name(name) File "/opt/hostedtoolcache/Python/3.10.12/x64/lib/python3.10/unittest/loader.py", line 377, in _get_module_from_name __import__(name) File "/home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/sources/CCPi-Regularisation-Toolkit/test/test_CPU_regularisers.py", line 6, in <module> from ccpi.filters.regularisers import FGP_TV, SB_TV, TGV, LLT_ROF, FGP_dTV, NDF, Diff4th, ROF_TV, PD_TV Errors while running CTest ModuleNotFoundError: No module named 'ccpi'
gcc-11:
-- XROOTD build command succeeded. See also /home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/ROOT/build/builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-build-*.log
[ 0%] Performing install step for 'XROOTD'
CMake Error at /home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/ROOT/build/builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-install-Release.cmake:49 (message):
Command failed: 1
'/usr/local/bin/cmake' '-Dmake=' '-Dconfig=' '-P' '/home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/ROOT/build/builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-install-Release-impl.cmake'
See also
/home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/ROOT/build/builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-install-*.log
gmake[5]: *** [builtins/xrootd/CMakeFiles/XROOTD.dir/build.make:104: builtins/xrootd/XROOTD-prefix/src/XROOTD-stamp/XROOTD-install] Error 1
gmake[4]: *** [CMakeFiles/Makefile2:9131: builtins/xrootd/CMakeFiles/XROOTD.dir/all] Error 2
gmake[3]: *** [Makefile:156: all] Error 2
gmake[2]: *** [CMakeFiles/ROOT.dir/build.make:86: builds/ROOT/stamp/ROOT-build] Error 2
gmake[1]: *** [CMakeFiles/Makefile2:590: CMakeFiles/ROOT.dir/all] Error 2
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Casper da Costa-Luis
Merged #897 into master.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.