Skip to content

Commit

Permalink
Fix conda install before Jigsaw build
Browse files Browse the repository at this point in the history
  • Loading branch information
xylar committed Feb 2, 2024
1 parent 652c108 commit 5268b5b
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions conda/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ def build_conda_env(env_type, recreate, mpi, conda_mpi, version,
check_call(commands, logger=logger)

if recreate or update_jigsaw:

build_jigsaw(activate_env, source_path, env_path, logger)
build_jigsaw(activate_env, conda_base, source_path, env_path,
logger)

# install (or reinstall) compass in edit mode
print('Installing compass\n')
Expand All @@ -360,7 +360,7 @@ def build_conda_env(env_type, recreate, mpi, conda_mpi, version,
check_call(commands, logger=logger)


def build_jigsaw(activate_env, source_path, env_path, logger):
def build_jigsaw(activate_env, conda_base, source_path, env_path, logger):
# remove conda jigsaw and jigsaw-python
t0 = time.time()
commands = \
Expand All @@ -381,6 +381,8 @@ def build_jigsaw(activate_env, source_path, env_path, logger):
cmake_args = f'-DCMAKE_BUILD_TYPE=Release -DNETCDF_LIBRARY={netcdf_lib}'

commands = \
f'source {conda_base}/etc/profile.d/conda.sh && ' \
f'conda activate polaris_bootstrap && ' \
f'conda install -y {jigsaw_build_deps} && ' \
f'cd {source_path}/jigsaw-python/external/jigsaw && ' \
f'rm -rf tmp && ' \
Expand Down

0 comments on commit 5268b5b

Please sign in to comment.