Skip to content

Commit

Permalink
Install pip requirements in spheral-build-env.
Browse files Browse the repository at this point in the history
  • Loading branch information
mdavis36 committed Nov 12, 2024
1 parent 9edfe44 commit d8f21a2
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ RUN locale-gen en_US.UTF-8
WORKDIR /home/spheral/workspace/
COPY scripts scripts
COPY .uberenv_config.json .

RUN apt-get install -y python3-dev python3-venv python3-pip
RUN python3 -m pip install -r scripts/build-requirements.txt -r scripts/runtime-requirements.txt

RUN python3 scripts/devtools/tpl-manager.py --spec $SPEC --spheral-spack-dir /home

# Clean workspace once dependencies are installed
Expand Down Expand Up @@ -68,12 +72,13 @@ RUN python3 scripts/devtools/host-config-build.py --host-config $HOST_CONFIG.cma

# Build Spheral
WORKDIR build_$HOST_CONFIG/build
RUN make python_build_env
RUN make python_runtime_env
RUN make -j $JCXX Spheral_CXX
RUN make -j $JPY
RUN make install

# Run ATS testing suite.
WORKDIR ../install
ENV MPLBACKEND=agg
RUN ./spheral-atstest --filter="level<100" tests/integration.ats
# -----------------------------------------------------------------------------
2 changes: 1 addition & 1 deletion scripts/atstest.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

@CMAKE_INSTALL_PREFIX@/.venv/bin/ats -e @CMAKE_INSTALL_PREFIX@/spheral @SPHERAL_ATS_BUILD_CONFIG_ARGS_STRING@ "$@"
@CMAKE_INSTALL_PREFIX@/spheral -m ats @SPHERAL_ATS_BUILD_CONFIG_ARGS_STRING@ "$@"
12 changes: 11 additions & 1 deletion scripts/spack/configs/ubuntu20.04/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,17 @@ packages:
blas: [netlib-lapack]
lapack: [netlib-lapack]
# ------ SYSTEM LIBS -------
# FIXME: Currently allowing spack to build cmake and git
# FIXME: Currently allowing spack to build cmake
git:
externals:
- spec: [email protected]
prefix: /usr
buildable: false
python:
externals:
- spec: [email protected]
prefix: /usr
buildable: false
ncurses:
externals:
- spec: [email protected]
Expand Down

0 comments on commit d8f21a2

Please sign in to comment.