From 1d3c108472bae5533300bcdb6646d824b0ec921e Mon Sep 17 00:00:00 2001 From: JJ Brosnan <84038776+jjbrosnan@users.noreply.github.com> Date: Tue, 18 Jan 2022 12:17:04 -0500 Subject: [PATCH] Updates - remove references to old packages --- README.md | 20 ++++++++++++------- .../python-examples/NLTK/docker-compose.yml | 8 ++++---- .../PyTorch/docker-compose.yml | 8 ++++---- .../SciKit-Learn/docker-compose.yml | 8 ++++---- .../TensorFlow/docker-compose.yml | 8 ++++---- .../python-examples/base/docker-compose.yml | 12 +++++------ containers/python/NLTK/docker-compose.yml | 10 +++++----- containers/python/PyTorch/docker-compose.yml | 10 +++++----- .../python/SciKit-Learn/docker-compose.yml | 10 +++++----- .../python/TensorFlow/docker-compose.yml | 10 +++++----- containers/python/base/docker-compose.yml | 10 +++++----- 11 files changed, 60 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index c02f9bfeac1..34cc3f3a746 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ which functions as the data backbone for prominent hedge funds, banks, and finan ## Supported Languages -| Language | Server Application | Client Application (OpenAPI) | -| ------------- | ------------------ | ---------------------------- | -| Python | Yes | Yes | -| Java / Groovy | Yes | Yes | -| C++ | No | Yes | -| JavaScript | No | Yes | -| gRPC | - | Yes | +| Language | Server Application | Client Application | +| ------------- | ------------------ | ------------------ | +| Python | Yes | Yes | +| Java / Groovy | Yes | Yes | +| C++ | No | Yes | +| JavaScript | No | Yes | +| gRPC | - | Yes | ## Run Deephaven @@ -118,6 +118,12 @@ docker-compose up -d Run the following commands to launch Deephaven for Python server applications with the [TensorFlow](https://www.tensorflow.org/) module pre-installed. +```bash +curl https://raw.githubusercontent.com/deephaven/deephaven-core/main/containeres/python/TensorFlow/docker-compose.yml -O +docker-compose pull +docker-compose up -d +``` + ### Launch: Python with example data Run the following commands to launch Deephaven for Python server applications, with example data. diff --git a/containers/python-examples/NLTK/docker-compose.yml b/containers/python-examples/NLTK/docker-compose.yml index f6286729201..49755b949cc 100644 --- a/containers/python-examples/NLTK/docker-compose.yml +++ b/containers/python-examples/NLTK/docker-compose.yml @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,12 +33,12 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" examples: - image: ghcr.io/deephaven/examples + image: ghcr.io/deephaven/examples:latest volumes: - ./data:/data command: initialize diff --git a/containers/python-examples/PyTorch/docker-compose.yml b/containers/python-examples/PyTorch/docker-compose.yml index 82181f436a5..0d8acffc6f6 100644 --- a/containers/python-examples/PyTorch/docker-compose.yml +++ b/containers/python-examples/PyTorch/docker-compose.yml @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,12 +33,12 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" examples: - image: ghcr.io/deephaven/examples + image: ghcr.io/deephaven/examples:latest volumes: - ./data:/data command: initialize diff --git a/containers/python-examples/SciKit-Learn/docker-compose.yml b/containers/python-examples/SciKit-Learn/docker-compose.yml index 80dc2f211ab..f1236d37bd8 100644 --- a/containers/python-examples/SciKit-Learn/docker-compose.yml +++ b/containers/python-examples/SciKit-Learn/docker-compose.yml @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,12 +33,12 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" examples: - image: ghcr.io/deephaven/examples + image: ghcr.io/deephaven/examples:latest volumes: - ./data:/data command: initialize diff --git a/containers/python-examples/TensorFlow/docker-compose.yml b/containers/python-examples/TensorFlow/docker-compose.yml index d686a7ca696..9a72559ccdd 100644 --- a/containers/python-examples/TensorFlow/docker-compose.yml +++ b/containers/python-examples/TensorFlow/docker-compose.yml @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,12 +33,12 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" examples: - image: ghcr.io/deephaven/examples + image: ghcr.io/deephaven/examples:latest volumes: - ./data:/data command: initialize diff --git a/containers/python-examples/base/docker-compose.yml b/containers/python-examples/base/docker-compose.yml index 850f4a0624e..e4633c5104a 100644 --- a/containers/python-examples/base/docker-compose.yml +++ b/containers/python-examples/base/docker-compose.yml @@ -1,8 +1,8 @@ version: "3.4" services: - grpc-api: - image: ghcr.io/deephaven/grpc-api:${VERSION:-latest} + server: + image: ghcr.io/deephaven/server:${VERSION:-latest} expose: - '8080' volumes: @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,12 +33,12 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" examples: - image: ghcr.io/deephaven/examples + image: ghcr.io/deephaven/examples:latest volumes: - ./data:/data command: initialize diff --git a/containers/python/NLTK/docker-compose.yml b/containers/python/NLTK/docker-compose.yml index 4ccfabd04d0..3e691154c6e 100644 --- a/containers/python/NLTK/docker-compose.yml +++ b/containers/python/NLTK/docker-compose.yml @@ -1,8 +1,8 @@ version: "3.4" services: - grpc-api: - image: ghcr.io/deephaven/nltk-base:${VERSION:-latest} + server: + image: ghcr.io/deephaven/server-nltk:${VERSION:-latest} expose: - '8080' volumes: @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,7 +33,7 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" diff --git a/containers/python/PyTorch/docker-compose.yml b/containers/python/PyTorch/docker-compose.yml index 676b2611f25..3b7a3a669b2 100644 --- a/containers/python/PyTorch/docker-compose.yml +++ b/containers/python/PyTorch/docker-compose.yml @@ -1,8 +1,8 @@ version: "3.4" services: - grpc-api: - image: ghcr.io/deephaven/pytorch-base:${VERSION:-latest} + server: + image: ghcr.io/deephaven/server-pytorch:${VERSION:-latest} expose: - '8080' volumes: @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,7 +33,7 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" diff --git a/containers/python/SciKit-Learn/docker-compose.yml b/containers/python/SciKit-Learn/docker-compose.yml index 431fba8a260..f86d65b8edc 100644 --- a/containers/python/SciKit-Learn/docker-compose.yml +++ b/containers/python/SciKit-Learn/docker-compose.yml @@ -1,8 +1,8 @@ version: "3.4" services: - grpc-api: - image: ghcr.io/deephaven/sklearn-base:${VERSION:-latest} + server: + image: ghcr.io/deephaven/server-sklearn:${VERSION:-latest} expose: - '8080' volumes: @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,7 +33,7 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" diff --git a/containers/python/TensorFlow/docker-compose.yml b/containers/python/TensorFlow/docker-compose.yml index 26420aed6e6..9d58d878bad 100644 --- a/containers/python/TensorFlow/docker-compose.yml +++ b/containers/python/TensorFlow/docker-compose.yml @@ -1,8 +1,8 @@ version: "3.4" services: - grpc-api: - image: ghcr.io/deephaven/tensorflow-base:${VERSION:-latest} + server: + image: ghcr.io/deephaven/server-tensorflow:${VERSION:-latest} expose: - '8080' volumes: @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,7 +33,7 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000" diff --git a/containers/python/base/docker-compose.yml b/containers/python/base/docker-compose.yml index dd0b9e72d40..ac9e86300ea 100644 --- a/containers/python/base/docker-compose.yml +++ b/containers/python/base/docker-compose.yml @@ -1,8 +1,8 @@ version: "3.4" services: - grpc-api: - image: ghcr.io/deephaven/grpc-api:${VERSION:-latest} + server: + image: ghcr.io/deephaven/server:${VERSION:-latest} expose: - '8080' volumes: @@ -22,9 +22,9 @@ services: grpc-proxy: image: ghcr.io/deephaven/grpc-proxy:${VERSION:-latest} environment: - - BACKEND_ADDR=grpc-api:8080 + - BACKEND_ADDR=server:8080 depends_on: - - grpc-api + - server expose: - '8080' @@ -33,7 +33,7 @@ services: depends_on: - web - grpc-proxy - - grpc-api + - server ports: - "${PORT:-10000}:10000"