Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,8 @@ ENV/
/provenance
/*.pickle

# conda package outputs
/conda/packages/outputs/

# activation scripts
/load_*.sh
14 changes: 10 additions & 4 deletions compass/load/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
import os
import subprocess
import sys
from importlib import resources

from compass.version import __version__ as compass_version
from jinja2 import Template
from importlib import resources

from compass.version import __version__ as compass_version


def get_conda_base_and_env():
Expand All @@ -27,8 +28,13 @@ def get_conda_base_and_env():
def get_mpi():

for mpi in ['mpich', 'openmpi']:
check = subprocess.check_output(
['conda', 'list', 'mpich']).decode('utf-8')
try:
check = subprocess.check_output(
['conda', 'list', mpi], stderr=subprocess.DEVNULL
).decode('utf-8')
except subprocess.CalledProcessError:
continue

if mpi in check:
return mpi

Expand Down
35 changes: 0 additions & 35 deletions conda/otps/recipe/meta.yaml

This file was deleted.

Loading
Loading