Skip to content

Commit 7470987

Browse files
authored
chore!: change folder structure (#144)
*Description of changes:* Move all the folders inside docker folder to one level up. By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
1 parent 1abb0d2 commit 7470987

32 files changed

+30
-30
lines changed

.github/workflows/build-neuron-jax-training-dlc.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
push:
55
branches: [ main ]
66
paths:
7-
- 'docker/jax/training/**'
8-
- 'docker/common/**'
7+
- 'jax/training/**'
8+
- 'common/**'
99
- '.github/workflows/build-neuron-jax-training-dlc.yaml'
1010
pull_request:
1111
branches: [ main ]
1212
paths:
13-
- 'docker/jax/training/**'
14-
- 'docker/common/**'
13+
- 'jax/training/**'
14+
- 'common/**'
1515
workflow_dispatch:
1616
inputs:
1717
jax_versions:
@@ -46,7 +46,7 @@ jobs:
4646
version=$(echo "$version" | xargs) # trim whitespace
4747
# Validate version format (only allow alphanumeric, dots, and hyphens)
4848
if [[ "$version" =~ ^[a-zA-Z0-9.-]+$ ]]; then
49-
path="docker/jax/training/$version"
49+
path="jax/training/$version"
5050
if [ -f "$path/Dockerfile.neuronx" ]; then
5151
matrix_json=$(echo "$matrix_json" | jq --arg v "$version" --arg p "$path" '. + [{"version": $v, "path": $p}]')
5252
fi
@@ -55,7 +55,7 @@ jobs:
5555
else
5656
# Detect changed Dockerfile paths
5757
changed_paths=$(git diff --name-only "origin/$BASE_REF" "$SHA" \
58-
| grep '^docker/jax/training/.*/Dockerfile.neuronx$' \
58+
| grep '^jax/training/.*/Dockerfile.neuronx$' \
5959
| xargs -n1 dirname \
6060
| sort -u)
6161
@@ -96,7 +96,7 @@ jobs:
9696
env:
9797
MATRIX_PATH: ${{ matrix.path }}
9898
run: |
99-
cp -r docker/common/* "$MATRIX_PATH"/
99+
cp -r common/* "$MATRIX_PATH"/
100100
101101
- name: Set up Docker Buildx
102102
uses: docker/setup-buildx-action@v3

.github/workflows/build-neuron-pytorch-inference-dlc.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
push:
55
branches: [ main ]
66
paths:
7-
- 'docker/pytorch/inference/**'
8-
- 'docker/common/**'
7+
- 'pytorch/inference/**'
8+
- 'common/**'
99
- '.github/workflows/build-neuron-pytorch-inference-dlc.yaml'
1010
pull_request:
1111
branches: [ main ]
1212
paths:
13-
- 'docker/pytorch/inference/**'
14-
- 'docker/common/**'
13+
- 'pytorch/inference/**'
14+
- 'common/**'
1515
workflow_dispatch:
1616
inputs:
1717
pytorch_versions:
@@ -46,7 +46,7 @@ jobs:
4646
version=$(echo "$version" | xargs) # trim whitespace
4747
# Validate version format (only allow alphanumeric, dots, and hyphens)
4848
if [[ "$version" =~ ^[a-zA-Z0-9.-]+$ ]]; then
49-
path="docker/pytorch/inference/$version"
49+
path="pytorch/inference/$version"
5050
if [ -f "$path/Dockerfile.neuronx" ]; then
5151
matrix_json=$(echo "$matrix_json" | jq --arg v "$version" --arg p "$path" '. + [{"version": $v, "path": $p}]')
5252
fi
@@ -55,7 +55,7 @@ jobs:
5555
else
5656
# Detect changed Dockerfile paths
5757
changed_paths=$(git diff --name-only "origin/$BASE_REF" "$SHA" \
58-
| grep '^docker/pytorch/inference/.*/Dockerfile.neuronx$' \
58+
| grep '^pytorch/inference/.*/Dockerfile.neuronx$' \
5959
| xargs -n1 dirname \
6060
| sort -u)
6161
@@ -96,7 +96,7 @@ jobs:
9696
env:
9797
MATRIX_PATH: ${{ matrix.path }}
9898
run: |
99-
cp -r docker/common/* "$MATRIX_PATH"/
99+
cp -r common/* "$MATRIX_PATH"/
100100
101101
- name: Set up Docker Buildx
102102
uses: docker/setup-buildx-action@v3

.github/workflows/build-neuron-pytorch-training-dlc.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
push:
55
branches: [ main ]
66
paths:
7-
- 'docker/pytorch/training/**'
8-
- 'docker/common/**'
7+
- 'pytorch/training/**'
8+
- 'common/**'
99
- '.github/workflows/build-neuron-pytorch-training-dlc.yaml'
1010
pull_request:
1111
branches: [ main ]
1212
paths:
13-
- 'docker/pytorch/training/**'
14-
- 'docker/common/**'
13+
- 'pytorch/training/**'
14+
- 'common/**'
1515
workflow_dispatch:
1616
inputs:
1717
pytorch_versions:
@@ -46,7 +46,7 @@ jobs:
4646
version=$(echo "$version" | xargs) # trim whitespace
4747
# Validate version format (only allow alphanumeric, dots, and hyphens)
4848
if [[ "$version" =~ ^[a-zA-Z0-9.-]+$ ]]; then
49-
path="docker/pytorch/training/$version"
49+
path="pytorch/training/$version"
5050
if [ -f "$path/Dockerfile.neuronx" ]; then
5151
matrix_json=$(echo "$matrix_json" | jq --arg v "$version" --arg p "$path" '. + [{"version": $v, "path": $p}]')
5252
fi
@@ -55,7 +55,7 @@ jobs:
5555
else
5656
# Detect changed Dockerfile paths
5757
changed_paths=$(git diff --name-only "origin/$BASE_REF" "$SHA" \
58-
| grep '^docker/pytorch/training/.*/Dockerfile.neuronx$' \
58+
| grep '^pytorch/training/.*/Dockerfile.neuronx$' \
5959
| xargs -n1 dirname \
6060
| sort -u)
6161
@@ -96,7 +96,7 @@ jobs:
9696
env:
9797
MATRIX_PATH: ${{ matrix.path }}
9898
run: |
99-
cp -r docker/common/* "$MATRIX_PATH"/
99+
cp -r common/* "$MATRIX_PATH"/
100100
101101
- name: Set up Docker Buildx
102102
uses: docker/setup-buildx-action@v3

.github/workflows/build-neuron-vllm-inference-dlc.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
push:
55
branches: [ main ]
66
paths:
7-
- 'docker/vllm/inference/**'
8-
- 'docker/common/**'
7+
- 'vllm/inference/**'
8+
- 'common/**'
99
- '.github/workflows/build-neuron-vllm-inference-dlc.yaml'
1010
pull_request:
1111
branches: [ main ]
1212
paths:
13-
- 'docker/vllm/inference/**'
14-
- 'docker/common/**'
13+
- 'vllm/inference/**'
14+
- 'common/**'
1515
workflow_dispatch:
1616
inputs:
1717
vllm_versions:
@@ -46,7 +46,7 @@ jobs:
4646
version=$(echo "$version" | xargs) # trim whitespace
4747
# Validate version format (only allow alphanumeric, dots, and hyphens)
4848
if [[ "$version" =~ ^[a-zA-Z0-9.-]+$ ]]; then
49-
path="docker/vllm/inference/$version"
49+
path="vllm/inference/$version"
5050
if [ -f "$path/Dockerfile.neuronx" ]; then
5151
matrix_json=$(echo "$matrix_json" | jq --arg v "$version" --arg p "$path" '. + [{"version": $v, "path": $p}]')
5252
fi
@@ -55,7 +55,7 @@ jobs:
5555
else
5656
# Detect changed Dockerfile paths
5757
changed_paths=$(git diff --name-only "origin/$BASE_REF" "$SHA" \
58-
| grep '^docker/vllm/inference/.*/Dockerfile.neuronx$' \
58+
| grep '^vllm/inference/.*/Dockerfile.neuronx$' \
5959
| xargs -n1 dirname \
6060
| sort -u)
6161
@@ -96,7 +96,7 @@ jobs:
9696
env:
9797
MATRIX_PATH: ${{ matrix.path }}
9898
run: |
99-
cp -r docker/common/* "$MATRIX_PATH"/
99+
cp -r common/* "$MATRIX_PATH"/
100100
101101
- name: Set up Docker Buildx
102102
uses: docker/setup-buildx-action@v3

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To build a specific container, navigate to the repository root and use Docker bu
1414

1515
```bash
1616
# Example: Build PyTorch 2.7.0 inference container
17-
docker build -f docker/pytorch/inference/2.7.0/Dockerfile.neuronx -t my-neuron-container .
17+
docker build -f pytorch/inference/2.7.0/Dockerfile.neuronx -t my-neuron-container .
1818
```
1919

2020
### Customizing Containers
@@ -79,4 +79,4 @@ See [SECURITY](SECURITY.md) for more information.
7979

8080
## License
8181

82-
This project is licensed under the Apache-2.0 License.
82+
This project is licensed under the Apache-2.0 License.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)