From f79dcc0ac22a1191501648119365fbaf11cad851 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 3 Nov 2023 13:28:08 -0700 Subject: [PATCH 1/5] Add `yasm` & `openslide` for wheel builds --- ci-wheel.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile index 0b900e1..7225299 100644 --- a/ci-wheel.Dockerfile +++ b/ci-wheel.Dockerfile @@ -34,7 +34,7 @@ RUN case "${LINUX_VER}" in \ jq wget gcc zlib1g-dev libbz2-dev \ libssl-dev libreadline-dev libsqlite3-dev libffi-dev curl git libncurses5-dev \ libnuma-dev openssh-client libcudnn8-dev zip libopenblas-dev liblapack-dev \ - protobuf-compiler autoconf automake libtool cmake \ + protobuf-compiler autoconf automake libtool cmake yasm openslide-dev \ && add-apt-repository ppa:git-core/ppa \ && add-apt-repository ppa:ubuntu-toolchain-r/test \ && apt update -y \ @@ -51,6 +51,7 @@ RUN case "${LINUX_VER}" in \ sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl \ numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel \ protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake \ + yasm openslide-devel \ && yum remove -y git \ && yum install -y https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm \ && yum install -y git jq devtoolset-11 \ @@ -74,7 +75,7 @@ RUN case "${LINUX_VER}" in \ && dnf install -y \ epel-release which wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite \ sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl \ - numactl-devel openssh-clients libcudnn8-devel zip jq \ + numactl-devel openssh-clients libcudnn8-devel zip jq yasm openslide-devel \ protobuf-compiler autoconf automake libtool dnf-plugins-core cmake \ && dnf config-manager --set-enabled powertools \ && dnf install -y blas-devel lapack-devel \ From cd82dd4326514d3c79b247cf2407bbd8a89021aa Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 3 Nov 2023 14:37:10 -0700 Subject: [PATCH 2/5] use `lib` w/OpenSlide on Ubuntu Co-authored-by: Gregory Lee --- ci-wheel.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile index 7225299..c27eb52 100644 --- a/ci-wheel.Dockerfile +++ b/ci-wheel.Dockerfile @@ -34,7 +34,7 @@ RUN case "${LINUX_VER}" in \ jq wget gcc zlib1g-dev libbz2-dev \ libssl-dev libreadline-dev libsqlite3-dev libffi-dev curl git libncurses5-dev \ libnuma-dev openssh-client libcudnn8-dev zip libopenblas-dev liblapack-dev \ - protobuf-compiler autoconf automake libtool cmake yasm openslide-dev \ + protobuf-compiler autoconf automake libtool cmake yasm libopenslide-dev \ && add-apt-repository ppa:git-core/ppa \ && add-apt-repository ppa:ubuntu-toolchain-r/test \ && apt update -y \ From a475457e10777865e3ee642151072cb61292ad47 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 3 Nov 2023 14:57:29 -0700 Subject: [PATCH 3/5] Add `yasm` via `powertools` --- ci-wheel.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile index c27eb52..2c56fdd 100644 --- a/ci-wheel.Dockerfile +++ b/ci-wheel.Dockerfile @@ -75,11 +75,12 @@ RUN case "${LINUX_VER}" in \ && dnf install -y \ epel-release which wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite \ sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl \ - numactl-devel openssh-clients libcudnn8-devel zip jq yasm openslide-devel \ + numactl-devel openssh-clients libcudnn8-devel zip jq openslide-devel \ protobuf-compiler autoconf automake libtool dnf-plugins-core cmake \ && dnf config-manager --set-enabled powertools \ && dnf install -y blas-devel lapack-devel \ && dnf -y install gcc-toolset-11-gcc gcc-toolset-11-gcc-c++ \ + && dnf -y yasm \ && dnf clean all \ && echo -e ' \ #!/bin/bash\n \ From e099ae18e203db9c2eb90d137c8cc9bd44e87bea Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 3 Nov 2023 15:05:07 -0700 Subject: [PATCH 4/5] Install/update `epel-release` before more installs --- ci-wheel.Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile index 2c56fdd..a8d804e 100644 --- a/ci-wheel.Dockerfile +++ b/ci-wheel.Dockerfile @@ -46,8 +46,10 @@ RUN case "${LINUX_VER}" in \ ;; \ "centos"*) \ yum update --exclude=libnccl* -y \ + && yum install -y epel-release\ + && yum update --exclude=libnccl* -y \ && yum install -y \ - epel-release which wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite \ + which wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite \ sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl \ numactl-devel openssh-clients libcudnn8-devel zip blas-devel lapack-devel \ protobuf-compiler autoconf automake libtool centos-release-scl scl-utils cmake \ @@ -72,8 +74,10 @@ RUN case "${LINUX_VER}" in \ ;; \ "rockylinux"*) \ dnf update -y \ + && dnf install -y epel-release \ + && dnf update -y \ && dnf install -y \ - epel-release which wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite \ + which wget gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite \ sqlite-devel xz xz-devel libffi-devel curl git ncurses-devel numactl \ numactl-devel openssh-clients libcudnn8-devel zip jq openslide-devel \ protobuf-compiler autoconf automake libtool dnf-plugins-core cmake \ From b77c613eb92dc42d0600817d504b2797cbfbba8d Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 3 Nov 2023 15:10:04 -0700 Subject: [PATCH 5/5] Add missing `install` to `dnf` --- ci-wheel.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-wheel.Dockerfile b/ci-wheel.Dockerfile index a8d804e..4f16891 100644 --- a/ci-wheel.Dockerfile +++ b/ci-wheel.Dockerfile @@ -84,7 +84,7 @@ RUN case "${LINUX_VER}" in \ && dnf config-manager --set-enabled powertools \ && dnf install -y blas-devel lapack-devel \ && dnf -y install gcc-toolset-11-gcc gcc-toolset-11-gcc-c++ \ - && dnf -y yasm \ + && dnf -y install yasm \ && dnf clean all \ && echo -e ' \ #!/bin/bash\n \