mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-06 00:20:18 +01:00
4f18739bf0
Pass install channel when building nightly images
Pass `TRITON_VERSION` argument to install triton for nightly images
Fix `generate_pytorch_version.py` to work with unannotated tags and avoid failures like the following:
```
% git checkout nightly
% ./.github/scripts/generate_pytorch_version.py
fatal: No annotated tags can describe '93f15b1b54ca5fb4a7ca9c21a813b4b86ebaeafa'.
However, there were unannotated tags: try --tags.
Traceback (most recent call last):
File "/Users/nshulga/git/pytorch/pytorch-release/./.github/scripts/generate_pytorch_version.py", line 120, in <module>
main()
File "/Users/nshulga/git/pytorch/pytorch-release/./.github/scripts/generate_pytorch_version.py", line 115, in main
print(version_obj.get_release_version())
File "/Users/nshulga/git/pytorch/pytorch-release/./.github/scripts/generate_pytorch_version.py", line 75, in get_release_version
if not get_tag():
File "/Users/nshulga/git/pytorch/pytorch-release/./.github/scripts/generate_pytorch_version.py", line 37, in get_tag
dirty_tag = subprocess.check_output(
File "/Users/nshulga/miniforge3/lib/python3.9/subprocess.py", line 424, in check_output
return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
File "/Users/nshulga/miniforge3/lib/python3.9/subprocess.py", line 528, in run
raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['git', 'describe']' returned non-zero exit status 128.
```
After the change nightly is reported as(due to autolabelling issue,
should be fixed by ttps://github.com/pytorch/test-infra/pull/1047 ):
```
% ./.github/scripts/generate_pytorch_version.py
ciflow/inductor/26921+cpu
```
Even for tagged release commits version generation was wrong:
```
% git checkout release/1.13
% ./.github/scripts/generate_pytorch_version.py
ciflow/periodic/79617-4848-g7c98e70d44+cpu
```
After the fix, it is as expected:
```
% ./.github/scripts/generate_pytorch_version.py
1.13.0+cpu
```
Pull Request resolved: https://github.com/pytorch/pytorch/pull/88741
Approved by: https://github.com/dagitses, https://github.com/msaroufim
97 lines
3.0 KiB
Makefile
97 lines
3.0 KiB
Makefile
DOCKER_REGISTRY ?= docker.io
|
|
DOCKER_ORG ?= $(shell docker info 2>/dev/null | sed '/Username:/!d;s/.* //')
|
|
DOCKER_IMAGE ?= pytorch
|
|
DOCKER_FULL_NAME = $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(DOCKER_IMAGE)
|
|
|
|
ifeq ("$(DOCKER_ORG)","")
|
|
$(warning WARNING: No docker user found using results from whoami)
|
|
DOCKER_ORG = $(shell whoami)
|
|
endif
|
|
|
|
CUDA_VERSION = 11.6.2
|
|
CUDNN_VERSION = 8
|
|
BASE_RUNTIME = ubuntu:18.04
|
|
BASE_DEVEL = nvidia/cuda:$(CUDA_VERSION)-cudnn$(CUDNN_VERSION)-devel-ubuntu18.04
|
|
|
|
# The conda channel to use to install cudatoolkit
|
|
CUDA_CHANNEL = nvidia
|
|
# The conda channel to use to install pytorch / torchvision
|
|
INSTALL_CHANNEL ?= pytorch
|
|
|
|
PYTHON_VERSION ?= 3.10
|
|
PYTORCH_VERSION ?= $(shell git describe --tags --always)
|
|
# Can be either official / dev
|
|
BUILD_TYPE ?= dev
|
|
BUILD_PROGRESS ?= auto
|
|
# Intentionally left blank
|
|
TRITON_VERSION ?=
|
|
BUILD_ARGS = --build-arg BASE_IMAGE=$(BASE_IMAGE) \
|
|
--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
|
|
--build-arg CUDA_VERSION=$(CUDA_VERSION) \
|
|
--build-arg CUDA_CHANNEL=$(CUDA_CHANNEL) \
|
|
--build-arg PYTORCH_VERSION=$(PYTORCH_VERSION) \
|
|
--build-arg INSTALL_CHANNEL=$(INSTALL_CHANNEL) \
|
|
--build-arg TRITON_VERSION=$(TRITON_VERSION)
|
|
EXTRA_DOCKER_BUILD_FLAGS ?=
|
|
|
|
BUILD ?= build
|
|
# Intentionally left blank
|
|
PLATFORMS_FLAG ?=
|
|
PUSH_FLAG ?=
|
|
USE_BUILDX ?=
|
|
BUILD_PLATFORMS ?=
|
|
WITH_PUSH ?= false
|
|
# Setup buildx flags
|
|
ifneq ("$(USE_BUILDX)","")
|
|
BUILD = buildx build
|
|
ifneq ("$(BUILD_PLATFORMS)","")
|
|
PLATFORMS_FLAG = --platform="$(BUILD_PLATFORMS)"
|
|
endif
|
|
# Only set platforms flags if using buildx
|
|
ifeq ("$(WITH_PUSH)","true")
|
|
PUSH_FLAG = --push
|
|
endif
|
|
endif
|
|
|
|
DOCKER_BUILD = DOCKER_BUILDKIT=1 \
|
|
docker $(BUILD) \
|
|
--progress=$(BUILD_PROGRESS) \
|
|
$(EXTRA_DOCKER_BUILD_FLAGS) \
|
|
$(PLATFORMS_FLAG) \
|
|
$(PUSH_FLAG) \
|
|
--target $(BUILD_TYPE) \
|
|
-t $(DOCKER_FULL_NAME):$(DOCKER_TAG) \
|
|
$(BUILD_ARGS) .
|
|
DOCKER_PUSH = docker push $(DOCKER_FULL_NAME):$(DOCKER_TAG)
|
|
|
|
.PHONY: all
|
|
all: devel-image
|
|
|
|
.PHONY: devel-image
|
|
devel-image: BASE_IMAGE := $(BASE_DEVEL)
|
|
devel-image: DOCKER_TAG := $(PYTORCH_VERSION)-devel
|
|
devel-image:
|
|
$(DOCKER_BUILD)
|
|
|
|
.PHONY: devel-push
|
|
devel-push: BASE_IMAGE := $(BASE_DEVEL)
|
|
devel-push: DOCKER_TAG := $(PYTORCH_VERSION)-devel
|
|
devel-push:
|
|
$(DOCKER_PUSH)
|
|
|
|
.PHONY: runtime-image
|
|
runtime-image: BASE_IMAGE := $(BASE_RUNTIME)
|
|
runtime-image: DOCKER_TAG := $(PYTORCH_VERSION)-runtime
|
|
runtime-image:
|
|
$(DOCKER_BUILD)
|
|
|
|
.PHONY: runtime-push
|
|
runtime-push: BASE_IMAGE := $(BASE_RUNTIME)
|
|
runtime-push: DOCKER_TAG := $(PYTORCH_VERSION)-runtime
|
|
runtime-push:
|
|
$(DOCKER_PUSH)
|
|
|
|
.PHONY: clean
|
|
clean:
|
|
-docker rmi -f $(shell docker images -q $(DOCKER_FULL_NAME))
|