Skip to content

Commit fc36171

Browse files
authored
Merge branch 'main' into fix_oqc_test
2 parents 2ed2c54 + 9db4859 commit fc36171

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ jobs:
315315
id: set-matrix
316316
run: |
317317
# Determine which providers to test based on inputs and event type
318-
# Disabling anyon, please see https://github.com/NVIDIA/cuda-quantum/issues/3598
319318
if [[ "${{ github.event_name }}" == "schedule" || "${{ inputs.target }}" == "nightly" ]]; then
320319
providers='["anyon", "fermioniq", "infleqtion", "ionq", "iqm", "oqc", "orca", "pasqal", "qci", "quantinuum"]'
321320
else
@@ -417,7 +416,8 @@ jobs:
417416
exit 1
418417
}
419418
rm -f "$TEMP_NETRC"
420-
read -r id_token refresh_token < <(echo "$response" | jq -r '.id_token, .refresh_token')
419+
id_token=$(printf '%s' "$response" | jq -r '.id_token')
420+
refresh_token=$(printf '%s' "$response" | jq -r '.refresh_token')
421421
echo "::add-mask::$id_token"
422422
echo "::add-mask::$refresh_token"
423423
printf "key: %s\nrefresh: %s\n" "$id_token" "$refresh_token" > "$HOME/.anyon_config"

scripts/validate_pycudaq.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,15 @@ fi
8585
# Execute instructions from the README file
8686
conda_script="$(awk '/(Begin conda install)/{flag=1;next}/(End conda install)/{flag=0}flag' "$readme_file" | grep . | sed '/^```/d')"
8787
if [ -n "${extra_packages}" ]; then
88-
pip_extra_url="--extra-index-url http://localhost:8080"
88+
pip_extra_arg="--find-links ${extra_packages}"
8989
fi
9090
while IFS= read -r line; do
9191
line=$(echo $line | sed -E "s/cuda_version=(.\{\{)?\s?\S+\s?(\}\})?/cuda_version=${cuda_version_conda} /g")
9292
line=$(echo $line | sed -E "s/python(=)?3.[0-9]{1,}/python\1${python_version}/g")
93-
line=$(echo $line | sed -E "s/pip install (.\{\{)?\s?\S+\s?(\}\})?/pip install cudaq==${cudaq_version} -v ${pip_extra_url//\//\\/}/g")
93+
line=$(echo "$line" | sed -E "s|pip install (.\{\{)?\s?\S+\s?(\}\})?|pip install cudaq==${cudaq_version} -v ${pip_extra_arg}|g")
9494
if [ -n "$(echo $line | grep "conda activate")" ]; then
9595
conda_env=$(echo "$line" | sed "s#conda activate##" | tr -d '[:space:]')
9696
source $(conda info --base)/bin/activate $conda_env
97-
if [ -n "${extra_packages}" ]; then
98-
eval "pip install cudaq --find-links ${extra_packages}"
99-
fi
10097
elif [ -n "$(echo $line | tr -d '[:space:]')" ]; then
10198
eval "$line"
10299
fi
@@ -294,7 +291,7 @@ if [ -n "$server2_devices" ]; then
294291
CUDA_VISIBLE_DEVICES=$server2_devices mpiexec --allow-run-as-root -np 2 python3 "$qpud_py" --port 12002 &
295292
fi
296293

297-
sleep 5 # wait for servers to launch
294+
sleep 20 # wait for servers to launch
298295
python3 "$root_folder/snippets/using/cudaq/platform/sample_async_remote.py" \
299296
--backend nvidia-mgpu --servers "$servers"
300297
if [ ! $? -eq 0 ]; then

0 commit comments

Comments
 (0)