Update dllogger installation

nv-dmajchrowski · nv-dmajchrowski · commit 22a214e2fa08 · 2022-01-05T17:05:32.000+01:00
diff --git a/PyTorch/Forecasting/TFT/Dockerfile b/PyTorch/Forecasting/TFT/Dockerfile
@@ -24,11 +24,12 @@ RUN apt-get update && apt-get install -y \
 
 WORKDIR /workspace
 
+RUN pip install --no-cache-dir nvidia-pyindex
+
 COPY requirements.txt .
 
 RUN pip uninstall -y typing && \
-    pip install --no-cache-dir --ignore-installed -r requirements.txt && \
-    pip install --no-cache-dir -e git+https://github.com/NVIDIA/dllogger#egg=dllogger
+    pip install --no-cache-dir --ignore-installed -r requirements.txt
 
 COPY . .
 
diff --git a/PyTorch/Forecasting/TFT/requirements.txt b/PyTorch/Forecasting/TFT/requirements.txt
@@ -1,2 +1,3 @@
+nvidia-dllogger==0.1.0
 pandas==1.3.4
 pynvml==11.0.0
diff --git a/TensorFlow/Recommendation/WideAndDeep/Dockerfile b/TensorFlow/Recommendation/WideAndDeep/Dockerfile
@@ -39,10 +39,11 @@ ENV SPARK_HOME /usr/local/spark
 ENV PYTHONPATH $SPARK_HOME/python:$SPARK_HOME/python/lib/py4j-0.10.7-src.zip
 ENV SPARK_OPTS --driver-java-options=-Xms1024M --driver-java-options=-Xmx4096M --driver-java-options=-Dlog4j.logLevel=info
 
-RUN pip install pyspark==2.3.1
-RUN pip install --no-deps tensorflow-transform==0.24.1 apache-beam==2.14 tensorflow-metadata==0.14.0 pydot dill
-RUN pip install ipdb
-RUN pip install -e git://github.com/NVIDIA/dllogger#egg=dllogger
+RUN pip install --no-cache-dir nvidia-pyindex
+
+COPY requirements* ./
+RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir --no-deps -r requirements-no-deps.txt
 
 WORKDIR  /wd
 COPY . .
diff --git a/TensorFlow/Recommendation/WideAndDeep/requirements-no-deps.txt b/TensorFlow/Recommendation/WideAndDeep/requirements-no-deps.txt
@@ -0,0 +1,5 @@
+tensorflow-transform==0.24.1
+apache-beam==2.14
+tensorflow-metadata==0.14.0
+pydot
+dill
diff --git a/TensorFlow/Recommendation/WideAndDeep/requirements.txt b/TensorFlow/Recommendation/WideAndDeep/requirements.txt
@@ -0,0 +1,3 @@
+nvidia-dllogger==0.1.0
+ipdb==0.13.9
+pyspark==2.3.1
diff --git a/TensorFlow2/Recommendation/WideAndDeep/Dockerfile b/TensorFlow2/Recommendation/WideAndDeep/Dockerfile
@@ -20,10 +20,9 @@ ENV HOROVOD_CYCLE_TIME=0.1
 ENV HOROVOD_FUSION_THRESHOLD=67108864
 ENV HOROVOD_NUM_STREAMS=2
 
-
-USER root
-
-RUN pip install --no-cache-dir -e git+https://github.com/NVIDIA/dllogger#egg=dllogger
+RUN pip install --no-cache-dir nvidia-pyindex
+ADD requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
 
 WORKDIR  /wd
 
diff --git a/TensorFlow2/Recommendation/WideAndDeep/requirements.txt b/TensorFlow2/Recommendation/WideAndDeep/requirements.txt
@@ -0,0 +1 @@
+nvidia-dllogger==0.1.0

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+nvidia-dllogger==0.1.0`
`1`	`2`	`pandas==1.3.4`
`2`	`3`	`pynvml==11.0.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+nvidia-dllogger==0.1.0`
	`2`	`+ipdb==0.13.9`
	`3`	`+pyspark==2.3.1`