support ppc64le (#893)

* support ppc64le * support grpc_health_probe for available suggestions on ppc64le
kubeflow · Nov 4, 2019 · c95c144 · c95c144
1 parent 975da72
commit c95c144
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 21 deletions.
diff --git a/cmd/manager/v1alpha3/Dockerfile b/cmd/manager/v1alpha3/Dockerfile
@@ -4,16 +4,17 @@ ADD . /go/src/github.com/kubeflow/katib
 WORKDIR /go/src/github.com/kubeflow/katib/cmd/manager
 RUN if [ "$(uname -m)" = "ppc64le" ]; then \
         apk --update add git gcc musl-dev && \
-        go build -o katib-manager ./v1alpha3  && \
-        go get github.com/grpc-ecosystem/grpc-health-probe && \
-        mv $GOPATH/bin/grpc-health-probe /bin/grpc_health_probe && \
-        chmod +x /bin/grpc_health_probe; \
+        go build -o katib-manager ./v1alpha3; \
     else \
-        go build -o katib-manager ./v1alpha3 && \
-        GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
-            wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
-            chmod +x /bin/grpc_health_probe; \
+        go build -o katib-manager ./v1alpha3; \
     fi
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
+    if [ "$(uname -m)" = "ppc64le" ]; then \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
+    else \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64; \
+    fi && \
+    chmod +x /bin/grpc_health_probe
 
 FROM alpine:3.7
 WORKDIR /app

diff --git a/cmd/suggestion/chocolate/v1alpha3/Dockerfile b/cmd/suggestion/chocolate/v1alpha3/Dockerfile
@@ -5,8 +5,12 @@ RUN if [ "$(uname -m)" = "ppc64le" ]; then \
         apt-get -y install gfortran libopenblas-dev liblapack-dev && \
         pip install cython; \
     fi
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.0 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
+    if [ "$(uname -m)" = "ppc64le" ]; then \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
+    else \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64; \
+    fi && \
     chmod +x /bin/grpc_health_probe
 
 ADD . /usr/src/app/github.com/kubeflow/katib

diff --git a/cmd/suggestion/hyperband/v1alpha3/Dockerfile b/cmd/suggestion/hyperband/v1alpha3/Dockerfile
@@ -5,10 +5,13 @@ RUN if [ "$(uname -m)" = "ppc64le" ]; then \
         apt-get -y install gfortran libopenblas-dev liblapack-dev && \
         pip install cython; \
     fi
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.0 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
+    if [ "$(uname -m)" = "ppc64le" ]; then \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
+    else \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64; \
+    fi && \
     chmod +x /bin/grpc_health_probe
-
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/hyperband/v1alpha3
 RUN pip install --no-cache-dir -r requirements.txt

diff --git a/cmd/suggestion/hyperopt/v1alpha3/Dockerfile b/cmd/suggestion/hyperopt/v1alpha3/Dockerfile
@@ -6,8 +6,12 @@ RUN if [ "$(uname -m)" = "ppc64le" ]; then \
         pip install cython; \
     fi
 
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.0 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
+    if [ "$(uname -m)" = "ppc64le" ]; then \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
+    else \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64; \
+    fi && \
     chmod +x /bin/grpc_health_probe
 
 ADD . /usr/src/app/github.com/kubeflow/katib
@@ -17,3 +21,4 @@ RUN pip install --no-cache-dir -r requirements.txt
 ENV PYTHONPATH /usr/src/app/github.com/kubeflow/katib:/usr/src/app/github.com/kubeflow/katib/pkg/apis/manager/v1alpha3/python:/usr/src/app/github.com/kubeflow/katib/pkg/apis/manager/health/python
 
 ENTRYPOINT ["python", "main.py"]
+
diff --git a/cmd/suggestion/nasrl/v1alpha3/Dockerfile b/cmd/suggestion/nasrl/v1alpha3/Dockerfile
@@ -5,10 +5,13 @@ RUN if [ "$(uname -m)" = "ppc64le" ]; then \
         apt-get -y install gfortran libopenblas-dev liblapack-dev && \
         pip install cython; \
     fi
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.0 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
+    if [ "$(uname -m)" = "ppc64le" ]; then \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
+    else \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64; \
+    fi && \
     chmod +x /bin/grpc_health_probe
-
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/nasrl/v1alpha3
 RUN pip install --no-cache-dir -r requirements.txt

diff --git a/cmd/suggestion/skopt/v1alpha3/Dockerfile b/cmd/suggestion/skopt/v1alpha3/Dockerfile
@@ -5,10 +5,13 @@ RUN if [ "$(uname -m)" = "ppc64le" ]; then \
         apt-get -y install gfortran libopenblas-dev liblapack-dev && \
         pip install cython; \
     fi
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.0 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+RUN GRPC_HEALTH_PROBE_VERSION=v0.3.1 && \
+    if [ "$(uname -m)" = "ppc64le" ]; then \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-ppc64le; \
+    else \
+	wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64; \
+    fi && \
     chmod +x /bin/grpc_health_probe
-
 ADD . /usr/src/app/github.com/kubeflow/katib
 WORKDIR /usr/src/app/github.com/kubeflow/katib/cmd/suggestion/skopt/v1alpha3
 RUN pip install --no-cache-dir -r requirements.txt