Skip to content

Commit 3bb1911

Browse files
authored
Merge branch 'pulp-platform:devel' into devel
2 parents b0c123d + 162aa45 commit 3bb1911

File tree

12 files changed

+152
-174
lines changed

12 files changed

+152
-174
lines changed

.github/workflows/ci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Build Deeploy
4343
shell: bash
4444
run: |
45-
pip install . --extra-index-url=https://pypi.ngc.nvidia.com
45+
pip install .
4646
pip install -r requirements-dev.txt
4747
- name: Format Python
4848
shell: bash

.github/workflows/docker-build-deeploy.yml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ jobs:
1919
runs-on: ubuntu-latest
2020
outputs:
2121
docker_tag: ${{ steps.generate_tag.outputs.docker_tag }}
22+
docker_release_tag: ${{ steps.detect_release_tag.outputs.release_tag }}
2223
steps:
2324
- uses: actions/checkout@v4
25+
with:
26+
fetch-depth: 0
2427

2528
- name: Set up environment variables
2629
run: |
@@ -37,6 +40,16 @@ jobs:
3740
echo "docker_tag=${{ env.BRANCH_NAME }}" >> $GITHUB_OUTPUT
3841
fi
3942
43+
- name: Detect release tag on HEAD
44+
id: detect_release_tag
45+
run: |
46+
TAG_ON_HEAD=$(git tag --points-at HEAD | head -n 1 || true)
47+
if [[ -n "$TAG_ON_HEAD" && "$IS_TAG" != "tag" ]]; then
48+
echo "release_tag=$TAG_ON_HEAD" >> $GITHUB_OUTPUT
49+
else
50+
echo "release_tag=" >> $GITHUB_OUTPUT
51+
fi
52+
4053
build-deeploy:
4154
name: Build Deploy Image
4255
needs: [prepare]
@@ -132,13 +145,31 @@ jobs:
132145
env:
133146
OWNER: "${{ github.repository_owner }}"
134147

148+
- name: Prepare manifest tags
149+
id: manifest_tags
150+
run: |
151+
OWNER_LC_VALUE=${OWNER,,}
152+
{
153+
echo "tags<<EOF"
154+
echo "ghcr.io/${OWNER_LC_VALUE}/deeploy:latest,"
155+
if [[ -n "${RELEASE_TAG}" ]]; then
156+
echo "ghcr.io/${OWNER_LC_VALUE}/deeploy:${DOCKER_TAG},"
157+
echo "ghcr.io/${OWNER_LC_VALUE}/deeploy:${RELEASE_TAG}"
158+
else
159+
echo "ghcr.io/${OWNER_LC_VALUE}/deeploy:${DOCKER_TAG}"
160+
fi
161+
echo "EOF"
162+
} >> $GITHUB_OUTPUT
163+
env:
164+
OWNER: ${{ github.repository_owner }}
165+
DOCKER_TAG: ${{ needs.prepare.outputs.docker_tag }}
166+
RELEASE_TAG: ${{ needs.prepare.outputs.docker_release_tag }}
167+
135168
- name: Merge Deeploy Images
136169
uses: Noelware/docker-manifest-action@v1
137170
with:
138171
inputs: |
139172
ghcr.io/${{ env.OWNER_LC }}/deeploy@${{ needs.build-deeploy.outputs.digest-amd64 }},
140173
ghcr.io/${{ env.OWNER_LC }}/deeploy@${{ needs.build-deeploy.outputs.digest-arm64 }}
141-
tags: |
142-
ghcr.io/${{ env.OWNER_LC }}/deeploy:latest,
143-
ghcr.io/${{ env.OWNER_LC }}/deeploy:${{ needs.prepare.outputs.docker_tag }}
174+
tags: ${{ steps.manifest_tags.outputs.tags }}
144175
push: true

.github/workflows/infra-generate-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-python@v5
2626
- name: Install dependencies
2727
run: |
28-
pip install . --extra-index-url=https://pypi.ngc.nvidia.com
28+
pip install .
2929
pip install -r requirements-dev.txt
3030
- name: Sphinx build
3131
run: |
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# SPDX-FileCopyrightText: 2025 ETH Zurich and University of Bologna
2+
#
3+
# SPDX-License-Identifier: Apache-2.0
4+
5+
name: Package • Publish to PyPi
6+
7+
on:
8+
push:
9+
tags:
10+
- "v*"
11+
workflow_dispatch:
12+
inputs:
13+
publish_target:
14+
description: "Select what to do when manually triggering the workflow"
15+
required: false
16+
default: build-only
17+
type: choice
18+
options:
19+
- build-only
20+
- test-pypi
21+
22+
permissions:
23+
contents: read
24+
id-token: write
25+
26+
jobs:
27+
build-package:
28+
name: Build package artifacts
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v5
33+
34+
- name: Install uv
35+
uses: astral-sh/setup-uv@v7
36+
37+
- name: Build artifacts
38+
run: uv build
39+
40+
- name: Test wheel installation
41+
run: uv run --isolated --no-project --with dist/*.whl python -c "import Deeploy"
42+
43+
- name: Test sdist installation
44+
run: uv run --isolated --no-project --with dist/*.tar.gz python -c "import Deeploy"
45+
46+
- name: Upload build artifacts
47+
uses: actions/upload-artifact@v4
48+
with:
49+
name: deeploy-dist
50+
path: dist
51+
if-no-files-found: error
52+
53+
publish-pypi:
54+
name: Publish to PyPI
55+
if: github.event_name == 'push'
56+
needs: build-package
57+
runs-on: ubuntu-latest
58+
steps:
59+
- name: Install uv
60+
uses: astral-sh/setup-uv@v7
61+
62+
- name: Download build artifacts
63+
uses: actions/download-artifact@v4
64+
with:
65+
name: deeploy-dist
66+
path: dist
67+
68+
- name: Publish to PyPI
69+
run: uv publish dist/*
70+
71+
publish-test-pypi:
72+
name: Publish to Test PyPI
73+
if: github.event_name == 'workflow_dispatch' && inputs.publish_target == 'test-pypi'
74+
needs: build-package
75+
runs-on: ubuntu-latest
76+
steps:
77+
- name: Install uv
78+
uses: astral-sh/setup-uv@v7
79+
80+
- name: Download build artifacts
81+
uses: actions/download-artifact@v4
82+
with:
83+
name: deeploy-dist
84+
path: dist
85+
86+
- name: Publish to Test PyPI
87+
run: uv publish dist/* --publish-url https://test.pypi.org/legacy/

.github/workflows/publish.yml

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

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ This file contains the changelog for the Deeploy project. The changelog is divid
55

66

77
### List of Pull Requests
8-
-
8+
- Update CLI interface Across Project, Fix Tutorial, and Remove Legacy Test [#157](https://github.com/pulp-platform/Deeploy/pull/157)
99

1010
### Added
1111
-
1212

1313
### Changed
14-
-
14+
- Aligned CLI commands across the project
1515

1616
### Fixed
17-
-
17+
- Fix test paths in Deeploy 101 tutorial
1818

1919
### Removed
20-
-
20+
- `testDMA.py` was an old test; we now have `test_dmas.py` instead.
2121

2222
## Release v0.2.1 (2026-02-05) [#158](https://github.com/pulp-platform/Deeploy/pull/158)
2323

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Additionally, add the title and link to the pull request in the list of pull req
3333
[...]
3434
3535
### Removed
36-
- Remove the link to the precompiled LLVM 12 in the `testRunner` for Snitch and in the CI.
36+
- Remove the link to the precompiled LLVM 12 in the `deeployRunner` for Snitch and in the CI.
3737
[...]
3838
```
3939

Container/Dockerfile.deeploy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ WORKDIR /app
8787

8888
COPY pyproject.toml ./
8989

90-
# Add nvidia channel to the pip configuration
91-
RUN mkdir -p /etc && printf "[global]\nextra-index-url = https://pypi.ngc.nvidia.com\n" > /etc/pip.conf
92-
9390
# Install dependencies
9491
RUN apt-get update && \
9592
apt-get install -y git-lfs \

Deeploy/Targets/PULPOpen/Templates/GEMMTemplate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def alignToContext(self, ctxt: NetworkContext,
5050
// LMACAN: In some edge cases sporadic errors happen if this loop is not added.
5151
// We believe this is due to missing bubbles in the pipeline that break operator forwarding.
5252
// Breaking test:
53-
// `python testRunner_tiled_siracusa.py -t=Tests/Models/Transformer --defaultMemLevel=L3 --doublebuffer --l1=30000`
53+
// `python deeployRunner_tiled_siracusa.py -t=Tests/Models/Transformer --defaultMemLevel=L3 --doublebuffer --l1=30000`
5454
#pragma unroll 1
5555
for(int k=0;k<3;k++){
5656
asm volatile("nop" ::);

DeeployTest/testDmas.py

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

0 commit comments

Comments
 (0)