Skip to content

Commit f9e8e23

Browse files
authored
Revert temporary changes (#80)
Signed-off-by: Thien Nguyen <[email protected]>
1 parent f24f4f7 commit f9e8e23

17 files changed

+5
-240
lines changed

.github/actions/start-pypi-server/action.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/dev_environment.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -314,27 +314,6 @@ jobs:
314314
restore-keys: |
315315
${{ steps.cache.outputs.local_buildcache_key }}
316316
317-
# FIXME: remove this before merging to public repo
318-
- name: Pre-release tarball file host
319-
id: tarball_host
320-
run: |
321-
cd /tmp && mkdir cuquantum-assets && cd cuquantum-assets
322-
echo "Download cuquantum-25.03 assets..."
323-
gh release download cuquantum-25.03 -R ${{ github.repository }}
324-
python3 -m http.server 5555 &
325-
env:
326-
GH_TOKEN: ${{ github.token }}
327-
328-
# FIXME: remove this before merging to public repo
329-
# devdeps.ext installs cuquantum using Python's pip
330-
- name: Start private PyPI server
331-
if: github.event.repository.private == true
332-
id: pypi_server
333-
uses: ./.github/actions/start-pypi-server
334-
with:
335-
release_name: 'cuquantum-25.03'
336-
port: 8080
337-
338317
- name: Build ${{ needs.metadata.outputs.image_title }} image
339318
id: docker_build
340319
uses: docker/build-push-action@v5

.github/workflows/docker_images.yml

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,7 @@ jobs:
165165
driver-opts: |
166166
network=host
167167
image=moby/buildkit:v0.19.0
168-
169-
# FIXME: remove this before merging to public repo
170-
- name: Start private PyPI server
171-
if: github.event.repository.private == true
172-
id: pypi_server
173-
uses: ./.github/actions/start-pypi-server
174-
with:
175-
release_name: 'cuquantum-25.03'
176-
port: 8080
177-
168+
178169
- name: Build Open MPI
179170
id: docker_build
180171
uses: docker/build-push-action@v5
@@ -604,15 +595,6 @@ jobs:
604595
run: |
605596
docker run --privileged multiarch/qemu-user-static:latest --reset -p yes --credential yes
606597
607-
# FIXME: remove this before merging to public repo
608-
- name: Start private PyPI server
609-
if: github.event.repository.private == true
610-
id: pypi_server
611-
uses: ./.github/actions/start-pypi-server
612-
with:
613-
release_name: 'cuquantum-25.03'
614-
port: 8080
615-
616598
- name: Build cuda-quantum image
617599
id: cudaq_build
618600
if: success() && !cancelled()
@@ -714,15 +696,6 @@ jobs:
714696
key: ${{ needs.cudaq_image.outputs.tar_cache }}
715697
fail-on-cache-miss: true
716698

717-
# FIXME: remove this before merging to public repo
718-
- name: Start private PyPI server
719-
if: github.event.repository.private == true
720-
id: pypi_server
721-
uses: ./.github/actions/start-pypi-server
722-
with:
723-
release_name: 'cuquantum-25.03'
724-
port: 8080
725-
726699
- name: Build documentation
727700
id: docs_build
728701
run: |
@@ -751,8 +724,7 @@ jobs:
751724
# Unfortunately, we need to install cuquantum for docs generation to work properly,
752725
# since using mock imports in the autodocs configuration doesn't work properly.
753726
# See also https://github.com/sphinx-doc/sphinx/issues/11211.
754-
# FIXME: remove extra-index-url before merging to public repo
755-
docker exec cuda-quantum-dev bash -c "python3 -m pip install cuquantum-python-cu12~=25.03 --extra-index-url ${{ steps.pypi_server.outputs.local_pypi_server_url }}"
727+
docker exec cuda-quantum-dev bash -c "python3 -m pip install cuquantum-python-cu12~=25.03"
756728
757729
(docker exec cuda-quantum-dev bash -c "export $docs_version && bash scripts/build_docs.sh" && built=true) || built=false
758730
if $built; then docker cp cuda-quantum-dev:"/usr/local/cudaq/docs/." docs; \

.github/workflows/prebuilt_binaries.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -149,26 +149,6 @@ jobs:
149149
org.opencontainers.image.title=cuda-quantum-assets
150150
org.opencontainers.image.description=Pre-built Linux binaries for CUDA Quantum
151151
152-
# FIXME: remove this step before merging to public main
153-
- name: Pre-release tarball file host
154-
id: tarball_host
155-
run: |
156-
cd /tmp && mkdir cuquantum-assets && cd cuquantum-assets
157-
echo "Download cuquantum-25.03 assets..."
158-
gh release download cuquantum-25.03 -R ${{ github.repository }}
159-
python3 -m http.server 5555 &
160-
env:
161-
GH_TOKEN: ${{ github.token }}
162-
163-
# FIXME: remove this before merging to public repo
164-
- name: Start private PyPI server
165-
if: github.event.repository.private == true
166-
id: pypi_server
167-
uses: ./.github/actions/start-pypi-server
168-
with:
169-
release_name: 'cuquantum-25.03'
170-
port: 8080
171-
172152
- name: Build assets
173153
id: docker_build
174154
uses: docker/build-push-action@v5
@@ -373,15 +353,6 @@ jobs:
373353
exit 1
374354
fi
375355
376-
# FIXME: remove this before merging to public repo
377-
- name: Start private PyPI server
378-
if: github.event.repository.private == true
379-
id: pypi_server
380-
uses: ./.github/actions/start-pypi-server
381-
with:
382-
release_name: 'cuquantum-25.03'
383-
port: 8080
384-
385356
- name: Side-by-side installation of Python support
386357
uses: ./.github/actions/run-in-docker
387358
with:
@@ -402,9 +373,6 @@ jobs:
402373
$PYTHON -m ensurepip --upgrade
403374
fi
404375
405-
# FIXME: remove the following line before merging to public main
406-
export PIP_EXTRA_INDEX_URL=http://localhost:8080
407-
408376
${PYTHON} -m pip install cuda_quantum*.whl
409377
${PYTHON} -m pip install pytest numpy psutil
410378
${PYTHON} -m pytest -v /home/cudaq/python \

.github/workflows/publishing.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -683,15 +683,6 @@ jobs:
683683
env:
684684
GH_TOKEN: ${{ secrets.REPO_BOT_ACCESS_TOKEN }}
685685

686-
# FIXME: remove this before merging to public repo
687-
- name: Start private PyPI server
688-
if: github.event.repository.private == true
689-
id: pypi_server
690-
uses: ./.github/actions/start-pypi-server
691-
with:
692-
release_name: 'cuquantum-25.03'
693-
port: 8080
694-
695686
- name: Log in to DockerHub
696687
uses: docker/login-action@v3
697688
with:
@@ -1041,17 +1032,6 @@ jobs:
10411032
path: /tmp/wheels
10421033
merge-multiple: true
10431034

1044-
# FIXME: remove this before merging to public
1045-
- name: Load cuQuantum assets
1046-
shell: bash
1047-
run: |
1048-
apt-get update && apt-get install -y --no-install-recommends ca-certificates gh
1049-
mkdir /tmp/packages && cd /tmp/packages
1050-
gh release download cuquantum-25.03 -R ${{ github.repository }}
1051-
rm -rf *archive.tar* && cd -
1052-
env:
1053-
GH_TOKEN: ${{ github.token }}
1054-
10551035
- name: Load metapackage
10561036
if: ${{ matrix.cuda_major == '' }}
10571037
uses: actions/download-artifact@v4
@@ -1147,17 +1127,6 @@ jobs:
11471127
pattern: '*-wheels'
11481128
path: /tmp/wheels
11491129
merge-multiple: true
1150-
1151-
# FIXME: remove this before merging to public
1152-
- name: Load cuQuantum assets
1153-
shell: bash
1154-
run: |
1155-
apt-get update && apt-get install -y --no-install-recommends ca-certificates gh
1156-
mkdir /tmp/packages && cd /tmp/packages
1157-
gh release download cuquantum-25.03 -R ${{ github.repository }}
1158-
rm -rf *archive.tar* && cd -
1159-
env:
1160-
GH_TOKEN: ${{ github.token }}
11611130

11621131
- name: Load metapackage
11631132
uses: actions/download-artifact@v4

.github/workflows/python_metapackages.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,6 @@ jobs:
132132
path: /tmp/wheels/
133133
merge-multiple: true
134134

135-
# FIXME: remove this before merging to public
136-
- name: Load cuQuantum assets
137-
run: |
138-
dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
139-
dnf install -y --nobest --setopt=install_weak_deps=False gh
140-
mkdir /tmp/packages && cd /tmp/packages
141-
gh release download cuquantum-25.03 -R ${{ github.repository }}
142-
rm -rf *archive.tar* && cd -
143-
env:
144-
GH_TOKEN: ${{ github.token }}
145-
146135
- name: Test installation
147136
run: |
148137
mkdir -p /tmp/packages

.github/workflows/python_wheels.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,6 @@ jobs:
6161
- name: Checkout repository
6262
uses: actions/checkout@v4
6363

64-
# FIXME: remove this before merging to public repo
65-
- name: Start private PyPI server
66-
if: github.event.repository.private == true
67-
id: pypi_server
68-
uses: ./.github/actions/start-pypi-server
69-
with:
70-
release_name: 'cuquantum-25.03'
71-
port: 8080
72-
7364
- name: Log in to DockerHub
7465
uses: docker/login-action@v3
7566
with:
@@ -203,15 +194,6 @@ jobs:
203194
- name: Checkout repository
204195
uses: actions/checkout@v4
205196

206-
# FIXME: remove this before merging to public repo
207-
- name: Start private PyPI server
208-
if: github.event.repository.private == true
209-
id: pypi_server
210-
uses: ./.github/actions/start-pypi-server
211-
with:
212-
release_name: 'cuquantum-25.03'
213-
port: 8080
214-
215197
- name: Log in to GitHub CR
216198
if: inputs.environment == ''
217199
uses: docker/login-action@v3
@@ -287,9 +269,6 @@ jobs:
287269
image: wheel_validation:local
288270
shell: bash
289271
run: |
290-
# FIXME: remove the following line before merging to public repo
291-
export PIP_EXTRA_INDEX_URL=http://localhost:8080
292-
293272
# Uninstall pip-installed cuda-quantum in the `wheel_validation:local` image.
294273
# In this step, we test the full installation workflow with conda;
295274
# hence we don't want to mix conda and pip packages.

.github/workflows/test_in_devenv.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,6 @@ jobs:
169169
- name: Checkout repository
170170
uses: actions/checkout@v4
171171

172-
# FIXME: remove this before merging to public repo
173-
- name: Start private PyPI server
174-
if: github.event.repository.private == true
175-
id: pypi_server
176-
uses: ./.github/actions/start-pypi-server
177-
with:
178-
release_name: 'cuquantum-25.03'
179-
port: 8080
180-
181172
- name: Restore environment
182173
id: restore_devdeps
183174
if: inputs.devdeps_image == ''
@@ -235,10 +226,6 @@ jobs:
235226
run: |
236227
cd $CUDAQ_REPO_ROOT
237228
pip install iqm_client==16.1 --user -vvv
238-
239-
# FIXME: remove the line below before merging to the public repo
240-
export PIP_EXTRA_INDEX_URL=http://localhost:8080
241-
242229
pip install . --user -vvv
243230
pyinstall_status=$?
244231
if [ ! $pyinstall_status -eq 0 ]; then

docker/build/assets.Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,19 +261,13 @@ RUN gcc_packages=$(dnf list installed "gcc*" | sed '/Installed Packages/d' | cut
261261
dnf remove -y $gcc_packages && dnf clean all && \
262262
dnf install -y --nobest --setopt=install_weak_deps=False glibc-devel
263263

264-
# FIXME: remove the following line before merging to public repo
265-
ENV PIP_EXTRA_INDEX_URL=http://localhost:8080
266-
267264
## [Python MLIR tests]
268265
RUN cd /cuda-quantum && source scripts/configure_build.sh && \
269266
python3 -m pip install lit pytest scipy cuquantum-python-cu$(echo ${CUDA_VERSION} | cut -d . -f1)~=25.03 && \
270267
"${LLVM_INSTALL_PREFIX}/bin/llvm-lit" -v _skbuild/python/tests/mlir \
271268
--param nvqpp_site_config=_skbuild/python/tests/mlir/lit.site.cfg.py
272269
# The other tests for the Python wheel are run post-installation.
273270

274-
# FIXME: remove the following line before merging to public repo
275-
ENV PIP_EXTRA_INDEX_URL=
276-
277271
## [C++ Tests]
278272
FROM cpp_build AS cpp_tests
279273
RUN gcc_packages=$(dnf list installed "gcc*" | sed '/Installed Packages/d' | cut -d ' ' -f1) && \

docker/build/devdeps.ext.Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ ENV CUDA_PATH="$CUDA_INSTALL_PREFIX"
161161
ENV PATH="${CUDA_INSTALL_PREFIX}/lib64/:${CUDA_INSTALL_PREFIX}/bin:${PATH}"
162162

163163
# Install cuQuantum dependencies, including cuTensor.
164-
# FIXME: remove the following line before merging to public repo
165-
ENV PIP_EXTRA_INDEX_URL=http://localhost:8080
166-
167164
RUN apt-get update && apt-get install -y --no-install-recommends \
168165
python3 python3-pip && \
169166
apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* && \
@@ -172,9 +169,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
172169
echo "expecting Python version 3.10"; \
173170
fi
174171

175-
# FIXME: remove the following line before merging to public repo
176-
ENV PIP_EXTRA_INDEX_URL=
177-
178172
ARG CUQUANTUM_INSTALL_PREFIX=/usr/local/lib/python3.10/dist-packages/cuquantum
179173
ENV CUQUANTUM_INSTALL_PREFIX="$CUQUANTUM_INSTALL_PREFIX"
180174
ENV CUQUANTUM_ROOT="$CUQUANTUM_INSTALL_PREFIX"

0 commit comments

Comments
 (0)