diff --git a/.travis.yml b/.travis.yml index d6a468b..1b19272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ env: - DOCKERFILE_DIR=machine-learning-ui - DOCKERFILE_DIR=mixer-ci - DOCKERFILE_DIR=mariadb - - DOCKERFILE_DIR=stacks/dlaas/oss - - DOCKERFILE_DIR=stacks/dlaas/mkl + - DOCKERFILE_DIR=stacks/dlrs/oss + - DOCKERFILE_DIR=stacks/dlrs/mkl script: - cd $DOCKERFILE_DIR diff --git a/README.md b/README.md index 0a4abf0..eb504c8 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,5 @@ Containers - mixer-ci - Keystone - MariaDB -- stacks-dlaas-oss -- stacks-dlaas-mkl +- stacks-dlrs-oss +- stacks-dlrs-mkl diff --git a/stacks/dlaas/README.md b/stacks/dlrs/README.md similarity index 100% rename from stacks/dlaas/README.md rename to stacks/dlrs/README.md diff --git a/stacks/dlaas/kubeflow/Dockerfile b/stacks/dlrs/kubeflow/Dockerfile similarity index 86% rename from stacks/dlaas/kubeflow/Dockerfile rename to stacks/dlrs/kubeflow/Dockerfile index 0d47756..d0bec3c 100644 --- a/stacks/dlaas/kubeflow/Dockerfile +++ b/stacks/dlrs/kubeflow/Dockerfile @@ -1,6 +1,6 @@ # Docker image for running examples in Tensorflow models. # base_image depends on whether we are running on GPUs or non-GPUs -FROM hub.docker.com/clearlinux/stacks-dlaas-oss:latest +FROM hub.docker.com/clearlinux/stacks-dlrs-oss:latest RUN mkdir -p /opt RUN swupd bundle-add go-basic diff --git a/stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/parts.yaml b/stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/parts.yaml similarity index 90% rename from stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/parts.yaml rename to stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/parts.yaml index 36f4d8a..c17d777 100644 --- a/stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/parts.yaml +++ b/stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/parts.yaml @@ -1,5 +1,5 @@ apiVersion: 0.0.1 kind: ksonnet.io/parts -name: dlaas-bench +name: dlrs-bench description: Prototypes for running DLaaS benchmarking on a multi node cluster author: Daniela Plascencia, Ganesh Mahalingam diff --git a/stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/prototypes/dlaas-alexnet.jsonnet b/stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/prototypes/dlrs-alexnet.jsonnet similarity index 93% rename from stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/prototypes/dlaas-alexnet.jsonnet rename to stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/prototypes/dlrs-alexnet.jsonnet index e8b9c37..6501212 100644 --- a/stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/prototypes/dlaas-alexnet.jsonnet +++ b/stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/prototypes/dlrs-alexnet.jsonnet @@ -1,6 +1,6 @@ // @apiVersion 0.1 -// @name io.intel.pkg.dlaas-alexnet -// @description dlaas multi-node benchmark +// @name io.intel.pkg.dlrs-alexnet +// @description dlrs multi-node benchmark // @shortDescription A multi-node DLaaS benchmark // @param name string Name for the job. @@ -8,7 +8,7 @@ local k = import "k.libsonnet"; local name = params.name; local namespace = env.namespace; -local image = "hub.docker.com/clearlinux/stacks-dlaas-kubeflow:latest"; +local image = "hub.docker.com/clearlinux/stacks-dlrs-kubeflow:latest"; local replicas = 3; local tfjob = { diff --git a/stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/prototypes/dlaas-resnet50.jsonnet b/stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/prototypes/dlrs-resnet50.jsonnet similarity index 93% rename from stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/prototypes/dlaas-resnet50.jsonnet rename to stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/prototypes/dlrs-resnet50.jsonnet index 55c54ec..ef4c7e4 100644 --- a/stacks/dlaas/kubeflow/dlaas-tfjob/dlaas-bench/prototypes/dlaas-resnet50.jsonnet +++ b/stacks/dlrs/kubeflow/dlrs-tfjob/dlrs-bench/prototypes/dlrs-resnet50.jsonnet @@ -1,6 +1,6 @@ // @apiVersion 0.1 -// @name io.intel.pkg.dlaas-resnet50 -// @description dlaas multi-node benchmark +// @name io.intel.pkg.dlrs-resnet50 +// @description dlrs multi-node benchmark // @shortDescription A multi-node DLaaS benchmark // @param name string Name for the job. @@ -8,7 +8,7 @@ local k = import "k.libsonnet"; local name = params.name; local namespace = env.namespace; -local image = "hub.docker.com/clearlinux/stacks-dlaas-kubeflow:latest"; +local image = "hub.docker.com/clearlinux/stacks-dlrs-kubeflow:latest"; local replicas = 3; local tfjob = { diff --git a/stacks/dlaas/kubeflow/dlaas-tfjob/registry.yaml b/stacks/dlrs/kubeflow/dlrs-tfjob/registry.yaml similarity index 66% rename from stacks/dlaas/kubeflow/dlaas-tfjob/registry.yaml rename to stacks/dlrs/kubeflow/dlrs-tfjob/registry.yaml index dd8fe4a..ad49c38 100644 --- a/stacks/dlaas/kubeflow/dlaas-tfjob/registry.yaml +++ b/stacks/dlrs/kubeflow/dlrs-tfjob/registry.yaml @@ -1,6 +1,6 @@ apiVersion: 0.1.0 kind: ksonnet.io/registry libraries: - dlaas-bench: - path: dlaas-bench + dlrs-bench: + path: dlrs-bench version: master diff --git a/stacks/dlaas/kubeflow/launcher.py b/stacks/dlrs/kubeflow/launcher.py similarity index 100% rename from stacks/dlaas/kubeflow/launcher.py rename to stacks/dlrs/kubeflow/launcher.py diff --git a/stacks/dlaas/mkl/Dockerfile b/stacks/dlrs/mkl/Dockerfile similarity index 100% rename from stacks/dlaas/mkl/Dockerfile rename to stacks/dlrs/mkl/Dockerfile diff --git a/stacks/dlaas/mkl/README.md b/stacks/dlrs/mkl/README.md similarity index 57% rename from stacks/dlaas/mkl/README.md rename to stacks/dlrs/mkl/README.md index 2a25557..13d0f93 100644 --- a/stacks/dlaas/mkl/README.md +++ b/stacks/dlrs/mkl/README.md @@ -1,12 +1,12 @@ # Deep Learning Reference Stack -[![](https://images.microbadger.com/badges/image/clearlinux/dlaas-mkl.svg)](http://microbadger.com/images/clearlinux/dlaas-mkl "Get your own image badge on microbadger.com") +[![](https://images.microbadger.com/badges/image/clearlinux/stacks-dlrs-mkl.svg)](http://microbadger.com/images/clearlinux/stacks-dlrs-mkl "Get your own image badge on microbadger.com") This variant is built with Intel® MKL-DNN library # Building Locally ``` -docker build --no-cache -t clearlinux/dlaas-mkl . # Optimized Intel Math Kernel Library (MKL) for Intel Architecture +docker build --no-cache -t clearlinux/stacks-dlrs-mkl . # Optimized Intel Math Kernel Library (MKL) for Intel Architecture ``` ## Optional Build ARGs @@ -19,7 +19,7 @@ docker build --no-cache -t clearlinux/dlaas-mkl . # Optimized Intel Math Ker --------------------------- ``` -docker pull clearlinux/dlaas-mkl +docker pull clearlinux/stacks-dlrs-mkl ``` Default build args in Docker are on: https://docs.docker.com/engine/reference/builder/#/arg diff --git a/stacks/dlaas/mkl/licenses/README.md b/stacks/dlrs/mkl/licenses/README.md similarity index 100% rename from stacks/dlaas/mkl/licenses/README.md rename to stacks/dlrs/mkl/licenses/README.md diff --git a/stacks/dlaas/mkl/licenses/clear_LICENSE b/stacks/dlrs/mkl/licenses/clear_LICENSE similarity index 100% rename from stacks/dlaas/mkl/licenses/clear_LICENSE rename to stacks/dlrs/mkl/licenses/clear_LICENSE diff --git a/stacks/dlaas/mkl/licenses/horovod_LICENSE b/stacks/dlrs/mkl/licenses/horovod_LICENSE similarity index 100% rename from stacks/dlaas/mkl/licenses/horovod_LICENSE rename to stacks/dlrs/mkl/licenses/horovod_LICENSE diff --git a/stacks/dlaas/mkl/licenses/miniconda_LICENSE b/stacks/dlrs/mkl/licenses/miniconda_LICENSE similarity index 100% rename from stacks/dlaas/mkl/licenses/miniconda_LICENSE rename to stacks/dlrs/mkl/licenses/miniconda_LICENSE diff --git a/stacks/dlaas/mkl/licenses/mkl_LICENSE b/stacks/dlrs/mkl/licenses/mkl_LICENSE similarity index 100% rename from stacks/dlaas/mkl/licenses/mkl_LICENSE rename to stacks/dlrs/mkl/licenses/mkl_LICENSE diff --git a/stacks/dlaas/mkl/setup_mkl.sh b/stacks/dlrs/mkl/setup_mkl.sh similarity index 100% rename from stacks/dlaas/mkl/setup_mkl.sh rename to stacks/dlrs/mkl/setup_mkl.sh diff --git a/stacks/dlaas/oss/Dockerfile b/stacks/dlrs/oss/Dockerfile similarity index 100% rename from stacks/dlaas/oss/Dockerfile rename to stacks/dlrs/oss/Dockerfile diff --git a/stacks/dlaas/oss/README.md b/stacks/dlrs/oss/README.md similarity index 59% rename from stacks/dlaas/oss/README.md rename to stacks/dlrs/oss/README.md index b23e281..a160b63 100644 --- a/stacks/dlaas/oss/README.md +++ b/stacks/dlrs/oss/README.md @@ -1,12 +1,12 @@ # Deep Learning Reference Stack -[![](https://images.microbadger.com/badges/image/clearlinux/dlaas.svg)](http://microbadger.com/images/clearlinux/dlaas "Get your own image badge on microbadger.com") +[![](https://images.microbadger.com/badges/image/clearlinux/stacks-dlrs-oss.svg)](http://microbadger.com/images/clearlinux/stacks-dlrs-oss "Get your own image badge on microbadger.com") This variant is built with Eigen # Building Locally ``` -docker build --no-cache -t clearlinux/dlaas . # Optimized for Intel Architecture +docker build --no-cache -t clearlinux/stacks-dlrs-oss . # Optimized for Intel Architecture ``` ## Optional Build ARGs @@ -19,7 +19,7 @@ docker build --no-cache -t clearlinux/dlaas . # Optimized for Intel Architec --------------------------- ``` -docker pull clearlinux/dlaas +docker pull clearlinux/stacks-dlrs-oss ``` Default build args in Docker are on: https://docs.docker.com/engine/reference/builder/#/arg diff --git a/stacks/dlaas/oss/licenses/README.md b/stacks/dlrs/oss/licenses/README.md similarity index 100% rename from stacks/dlaas/oss/licenses/README.md rename to stacks/dlrs/oss/licenses/README.md diff --git a/stacks/dlaas/oss/licenses/clear_LICENSE b/stacks/dlrs/oss/licenses/clear_LICENSE similarity index 100% rename from stacks/dlaas/oss/licenses/clear_LICENSE rename to stacks/dlrs/oss/licenses/clear_LICENSE diff --git a/stacks/dlaas/oss/licenses/horovod_LICENSE b/stacks/dlrs/oss/licenses/horovod_LICENSE similarity index 100% rename from stacks/dlaas/oss/licenses/horovod_LICENSE rename to stacks/dlrs/oss/licenses/horovod_LICENSE diff --git a/stacks/dlaas/releasenote.md b/stacks/dlrs/releasenote.md similarity index 100% rename from stacks/dlaas/releasenote.md rename to stacks/dlrs/releasenote.md