From 819fa60c55648be33f0fe32f122f85b1c06c1278 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 15:24:04 +0900 Subject: [PATCH 01/13] rustmath/intel-mkl:1.49.0 --- docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Makefile b/docker/Makefile index 5707b5a0..f4a2579d 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,5 +1,5 @@ REGISTRY := rustmath -RUST_VERSION := 1.43.0 +RUST_VERSION := 1.49.0 all: test ubuntu centos From f26efd0086ab060795e5efea741e6701f5d2fbee Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 15:56:39 +0900 Subject: [PATCH 02/13] Use GitHub Package instead of DockerHub --- docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Makefile b/docker/Makefile index f4a2579d..4de871ce 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,4 +1,4 @@ -REGISTRY := rustmath +REGISTRY := docker.pkg.github.com/rust-math/intel-mkl-src RUST_VERSION := 1.49.0 all: test ubuntu centos From b5626e5e7839b04eaa464beee67f04855d7eb55a Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 15:59:05 +0900 Subject: [PATCH 03/13] Workflow for push to GitHub Package using GITHUB_TOKEN --- .github/workflows/docker.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 00000000..d0a11d7b --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,17 @@ +name: Docker + +on: + push: + branches: + - master + pull_request: {} + +jobs: + push: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v1 + - name: build and push docker image + run: | + cd docker + make push From 6685c249c9930cf242babdfe20fd92b302af5664 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 16:29:56 +0900 Subject: [PATCH 04/13] Add auth using GITHUB_TOKEN --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d0a11d7b..d32a00d7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,5 +13,6 @@ jobs: - uses: actions/checkout@v1 - name: build and push docker image run: | + echo "${{ github.token }}" | docker login https://docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin cd docker make push From 1da80432947a58d7d3361f54792bae477dbfddee Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 17:28:43 +0900 Subject: [PATCH 05/13] Add CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94284461..71d59377 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Unreleased +----------- + +### Changed + +- Repository of container image has been moved to GitHub Packages from DockerHub https://github.com/rust-math/intel-mkl-src/pull/60 + 0.6.0+mkl2020.1 - 2020-06-23 ============================= From 3b452cf0cf63d64b19ed7be2eb518ca808c0ff35 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 20:43:19 +0900 Subject: [PATCH 06/13] Use ghcr.io instead of docker.pkg.github.com --- docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Makefile b/docker/Makefile index 4de871ce..910cac4a 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,4 +1,4 @@ -REGISTRY := docker.pkg.github.com/rust-math/intel-mkl-src +REGISTRY := ghcr.io/rust-math/intel-mkl-src RUST_VERSION := 1.49.0 all: test ubuntu centos From b2d543d202a2e64af9ea06c93cc7071749b3a9c8 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 21:10:19 +0900 Subject: [PATCH 07/13] Refactoring Makefile --- docker/Makefile | 39 ++++++++----------- docker/centos.mk | 3 ++ docker/common.mk | 16 ++++++++ ...entos.Dockerfile => mkl-centos.Dockerfile} | 0 docker/{Dockerfile => mkl-rust.Dockerfile} | 0 ...buntu.Dockerfile => mkl-ubuntu.Dockerfile} | 0 docker/rust.mk | 3 ++ docker/ubuntu.mk | 3 ++ 8 files changed, 42 insertions(+), 22 deletions(-) create mode 100644 docker/centos.mk create mode 100644 docker/common.mk rename docker/{centos.Dockerfile => mkl-centos.Dockerfile} (100%) rename docker/{Dockerfile => mkl-rust.Dockerfile} (100%) rename docker/{ubuntu.Dockerfile => mkl-ubuntu.Dockerfile} (100%) create mode 100644 docker/rust.mk create mode 100644 docker/ubuntu.mk diff --git a/docker/Makefile b/docker/Makefile index 910cac4a..8fadd8f6 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,28 +1,23 @@ -REGISTRY := ghcr.io/rust-math/intel-mkl-src -RUST_VERSION := 1.49.0 +TARGETS := rust ubuntu centos -all: test ubuntu centos +all: build +build: $(foreach TARGET,$(TARGETS),build/$(TARGET)) +push: $(foreach TARGET,$(TARGETS),push/$(TARGET)) -build: - docker build . \ - --build-arg "RUST_VERSION=$(RUST_VERSION)" \ - -t $(REGISTRY)/mkl-rust:$(RUST_VERSION) +build/rust: + $(MAKE) -f rust.mk build -push: build ubuntu centos - docker push $(REGISTRY)/mkl-rust:$(RUST_VERSION) - docker push $(REGISTRY)/mkl-centos:$(RUST_VERSION) - docker push $(REGISTRY)/mkl-ubuntu:$(RUST_VERSION) +build/ubuntu: + $(MAKE) -f ubuntu.mk build -test: build - docker run -it --rm $(REGISTRY)/mkl-rust:$(RUST_VERSION) pkg-config --libs mkl-dynamic-lp64-iomp - docker run -it --rm $(REGISTRY)/mkl-rust:$(RUST_VERSION) ldconfig -p | grep mkl +build/centos: + $(MAKE) -f centos.mk build -ubuntu: - docker build . -f $@.Dockerfile \ - --build-arg "RUST_VERSION=$(RUST_VERSION)" \ - -t $(REGISTRY)/mkl-ubuntu:$(RUST_VERSION) +push/rust: build/rust + $(MAKE) -f rust.mk push -centos: - docker build . -f $@.Dockerfile \ - --build-arg "RUST_VERSION=$(RUST_VERSION)" \ - -t $(REGISTRY)/mkl-centos:$(RUST_VERSION) +push/ubuntu: build/ubuntu + $(MAKE) -f ubuntu.mk push + +push/centos: build/centos + $(MAKE) -f centos.mk push diff --git a/docker/centos.mk b/docker/centos.mk new file mode 100644 index 00000000..c320316b --- /dev/null +++ b/docker/centos.mk @@ -0,0 +1,3 @@ +HERE := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) +TARGET := mkl-centos +include $(HERE)/common.mk diff --git a/docker/common.mk b/docker/common.mk new file mode 100644 index 00000000..6a5a5faf --- /dev/null +++ b/docker/common.mk @@ -0,0 +1,16 @@ +TOP := $(shell git rev-parse --show-toplevel) +HERE := $(TOP)/docker + +REGISTRY := ghcr.io/rust-math/intel-mkl-src +RUST_VERSION := 1.49.0 + +all: build + +build: + docker build $(HERE) \ + --build-arg "RUST_VERSION=$(RUST_VERSION)" \ + -t $(REGISTRY)/$(TARGET):$(RUST_VERSION) \ + -f $(TARGET).Dockerfile + +push: build + docker push $(REGISTRY)/$(TARGET):$(RUST_VERSION) diff --git a/docker/centos.Dockerfile b/docker/mkl-centos.Dockerfile similarity index 100% rename from docker/centos.Dockerfile rename to docker/mkl-centos.Dockerfile diff --git a/docker/Dockerfile b/docker/mkl-rust.Dockerfile similarity index 100% rename from docker/Dockerfile rename to docker/mkl-rust.Dockerfile diff --git a/docker/ubuntu.Dockerfile b/docker/mkl-ubuntu.Dockerfile similarity index 100% rename from docker/ubuntu.Dockerfile rename to docker/mkl-ubuntu.Dockerfile diff --git a/docker/rust.mk b/docker/rust.mk new file mode 100644 index 00000000..c6784f1b --- /dev/null +++ b/docker/rust.mk @@ -0,0 +1,3 @@ +HERE := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) +TARGET := mkl-rust +include $(HERE)/common.mk diff --git a/docker/ubuntu.mk b/docker/ubuntu.mk new file mode 100644 index 00000000..3d279694 --- /dev/null +++ b/docker/ubuntu.mk @@ -0,0 +1,3 @@ +HERE := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) +TARGET := mkl-ubuntu +include $(HERE)/common.mk From 4c62ccefeec0d9323cb977d7988f91619faeaf6d Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 21:14:12 +0900 Subject: [PATCH 08/13] Split Actions --- .github/workflows/docker.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d32a00d7..15ac96a1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,4 +1,4 @@ -name: Docker +name: docker on: push: @@ -7,12 +7,29 @@ on: pull_request: {} jobs: - push: + rust: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v1 + - name: build and push docker image + run: | + echo "${{ github.token }}" | docker login https://docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin + make -C docker push/rust + + centos: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v1 + - name: build and push docker image + run: | + echo "${{ github.token }}" | docker login https://docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin + make -C docker push/centos + + ubuntu: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - name: build and push docker image run: | echo "${{ github.token }}" | docker login https://docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin - cd docker - make push + make -C docker push/ubuntu From e8a9a2f06ef712ceda4ea358c17c83eaab4981ca Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 21:20:16 +0900 Subject: [PATCH 09/13] Fix auth --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 15ac96a1..2a149383 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v1 - name: build and push docker image run: | - echo "${{ github.token }}" | docker login https://docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin + echo "${{ github.token }}" | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin make -C docker push/rust centos: @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v1 - name: build and push docker image run: | - echo "${{ github.token }}" | docker login https://docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin + echo "${{ github.token }}" | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin make -C docker push/centos ubuntu: @@ -31,5 +31,5 @@ jobs: - uses: actions/checkout@v1 - name: build and push docker image run: | - echo "${{ github.token }}" | docker login https://docker.pkg.github.com -u ${GITHUB_ACTOR} --password-stdin + echo "${{ github.token }}" | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin make -C docker push/ubuntu From 0fb54d9b030b285f343788c9ef71f46335fada19 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 22:03:08 +0900 Subject: [PATCH 10/13] Use github.actor --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2a149383..e3eb5966 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v1 - name: build and push docker image run: | - echo "${{ github.token }}" | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin + echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin make -C docker push/rust centos: @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v1 - name: build and push docker image run: | - echo "${{ github.token }}" | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin + echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin make -C docker push/centos ubuntu: @@ -31,5 +31,5 @@ jobs: - uses: actions/checkout@v1 - name: build and push docker image run: | - echo "${{ github.token }}" | docker login ghcr.io -u ${GITHUB_ACTOR} --password-stdin + echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin make -C docker push/ubuntu From 22f7b56d6756eb4f0f30b04cd496a84111f74312 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 22:38:55 +0900 Subject: [PATCH 11/13] Drop GitHub Actions setting for Docker --- .github/workflows/docker.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index e3eb5966..00000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: docker - -on: - push: - branches: - - master - pull_request: {} - -jobs: - rust: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v1 - - name: build and push docker image - run: | - echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - make -C docker push/rust - - centos: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v1 - - name: build and push docker image - run: | - echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - make -C docker push/centos - - ubuntu: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v1 - - name: build and push docker image - run: | - echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - make -C docker push/ubuntu From eb3813e21906d466c7d11e04e79b89da8895ddbc Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 22:39:55 +0900 Subject: [PATCH 12/13] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71d59377..6c0c770c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Unreleased ### Changed -- Repository of container image has been moved to GitHub Packages from DockerHub https://github.com/rust-math/intel-mkl-src/pull/60 +- Repository of container image has been moved to GitHub Container Registry (ghcr.io) from DockerHub https://github.com/rust-math/intel-mkl-src/pull/60 0.6.0+mkl2020.1 - 2020-06-23 ============================= From 9bfeb743236f749866e230b847751e973b4b2e2b Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 10 Apr 2021 22:48:57 +0900 Subject: [PATCH 13/13] Update tests in intel-mkl-tool --- intel-mkl-tool/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/intel-mkl-tool/Makefile b/intel-mkl-tool/Makefile index c179a58b..7e87fe33 100644 --- a/intel-mkl-tool/Makefile +++ b/intel-mkl-tool/Makefile @@ -1,18 +1,19 @@ HERE := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -RUST_VERSION := 1.43.0 +REGISTRY := ghcr.io/rust-math/intel-mkl-src +RUST_VERSION := 1.49.0 DOCKER_OPTION := --rm -u $(shell id -u):$(shell id -g) -v $(HERE):/src test: - docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache rustmath/mkl-rust:$(RUST_VERSION) cargo test with_mkl -- --ignored + docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache $(REGISTRY)/mkl-rust:$(RUST_VERSION) cargo test with_mkl -- --ignored seek: - docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache rustmath/mkl-rust:$(RUST_VERSION) cargo run --release -- seek + docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache $(REGISTRY)/mkl-rust:$(RUST_VERSION) cargo run --release -- seek package: - docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache rustmath/mkl-rust:$(RUST_VERSION) cargo run --release -- package + docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-cache $(REGISTRY)/mkl-rust:$(RUST_VERSION) cargo run --release -- package seek-ubuntu: - docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-ubuntu rustmath/mkl-ubuntu:$(RUST_VERSION) cargo run --release -- seek + docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-ubuntu $(REGISTRY)/mkl-ubuntu:$(RUST_VERSION) cargo run --release -- seek seek-centos: - docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-centos rustmath/mkl-centos:$(RUST_VERSION) cargo run --release -- seek + docker run $(DOCKER_OPTION) --env CARGO_HOME=/src/.cargo-centos $(REGISTRY)/mkl-centos:$(RUST_VERSION) cargo run --release -- seek