Skip to content

Commit 11cf67c

Browse files
committed
Merge branch 'test-publishing' of https://github.com/NVIDIA/cuda-quantum into test-publishing
2 parents 375b47c + d81e19d commit 11cf67c

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

.github/workflows/test_in_devenv.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,15 @@ jobs:
9898
echo "::error file=test_in_devenv.yml::Python interop tests failed with status $pytest_status."
9999
exit 1
100100
fi
101-
ctest --output-on-failure --test-dir build -E "ctest-nvqpp|ctest-targettests"
102-
ctest_status=$?
103-
$LLVM_INSTALL_PREFIX/bin/llvm-lit -v --time-tests --param nvqpp_site_config=build/test/lit.site.cfg.py build/test
104-
lit_status=$?
105-
$LLVM_INSTALL_PREFIX/bin/llvm-lit -v --time-tests --param nvqpp_site_config=build/targettests/lit.site.cfg.py build/targettests
101+
# ctest --output-on-failure --test-dir build -E "ctest-nvqpp|ctest-targettests"
102+
# ctest_status=$?
103+
# $LLVM_INSTALL_PREFIX/bin/llvm-lit -v --time-tests --param nvqpp_site_config=build/test/lit.site.cfg.py build/test
104+
# lit_status=$?
105+
export CUDAQ_LOG_LEVEL=info
106+
$LLVM_INSTALL_PREFIX/bin/llvm-lit -v --time-tests --param nvqpp_site_config=build/targettests/lit.site.cfg.py build/targettests/execution/graph_coloring-1.cpp
106107
targ_status=$?
107-
$LLVM_INSTALL_PREFIX/bin/llvm-lit -v --time-tests --param nvqpp_site_config=build/python/tests/mlir/lit.site.cfg.py build/python/tests/mlir
108-
pymlir_status=$?
108+
# $LLVM_INSTALL_PREFIX/bin/llvm-lit -v --time-tests --param nvqpp_site_config=build/python/tests/mlir/lit.site.cfg.py build/python/tests/mlir
109+
# pymlir_status=$?
109110
if [ ! $ctest_status -eq 0 ] || [ ! $lit_status -eq 0 ] || [ $targ_status -ne 0 ] || [ $pymlir_status -ne 0 ]; then
110111
echo "::error file=test_in_devenv.yml::C++ tests failed (ctest status $ctest_status, llvm-lit status $lit_status, \
111112
target tests status $targ_status, Python MLIR status $pymlir_status)."
@@ -241,7 +242,7 @@ jobs:
241242
python3 -m venv --system-site-packages "$VENV_DIR"
242243
. "$VENV_DIR/bin/activate"
243244
244-
pip install iqm-client==16.1
245+
pip install iqm-client==28.0.0
245246
pip install . -vvv
246247
pyinstall_status=$?
247248
if [ ! $pyinstall_status -eq 0 ]; then

docs/sphinx/applications/python/digitized_counterdiabatic_qaoa.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"#non_edges=[[u,v] for u in nodes for v in nodes if u<v and [u,v] not in edges]\n",
103103
"#print('Edges: ', edges)\n",
104104
"#print('Non-edges: ', non_edges)\n",
105-
"#weights=[0.6686,0.6686,0.6886,0.1091,0.0770,0.0770,0.0770,0.0770]\n",
105+
"#weights=[0.6686,0.6686,0.6686,0.1091,0.0770,0.0770,0.0770,0.0770]\n",
106106
"#penalty=8.0\n",
107107
"#num_layers=8"
108108
]

scripts/validate_pycudaq.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ 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
@@ -306,7 +306,7 @@ if [ -n "$server2_devices" ]; then
306306
CUDA_VISIBLE_DEVICES=$server2_devices mpiexec --allow-run-as-root -np 2 python3 "$qpud_py" --port 12002 &
307307
fi
308308

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

0 commit comments

Comments
 (0)