Merge branch 'main' into nightly-fix-orca

NVIDIA · Feb 28, 2025 · a742e2b · a742e2b
2 parents 61afac5 + 9ae03a5
commit a742e2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml
@@ -969,7 +969,7 @@ jobs:
           bash ~/.miniconda3/miniconda.sh -b -u -p ~/.miniconda3
           rm -rf ~/.miniconda3/miniconda.sh
           eval "$(~/.miniconda3/bin/conda shell.bash hook)"
-          conda install -y -c conda-forge openmpi
+          conda install -y -c conda-forge openmpi">=5.0.7"
 
           echo 'eval "$(~/.miniconda3/bin/conda shell.bash hook)"' >> ~/.bashrc
           echo 'export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CONDA_PREFIX/lib"' >> ~/.bashrc

diff --git a/scripts/validate_container.sh b/scripts/validate_container.sh
@@ -83,7 +83,7 @@ available_backends=`\
         gpus=${requirements##* }
         if [ "${qpu}" != "remote_rest" ] && [ "${qpu}" != "NvcfSimulatorQPU" ] \
         && [ "${qpu}" != "fermioniq" ] && [ "${qpu}" != "orca" ] \
-        && [ "${qpu}  != "pasqal" && [ "${qpu}" != "quera" ] \
+        && [ "${qpu}" != "pasqal" && [ "${qpu}" != "quera" ] \
         && ($gpu_available || [ -z "$gpus" ] || [ "${gpus,,}" == "false" ]); then \
             basename $file | cut -d "." -f 1; \
         fi; \