Skip to content

Commit 94bcf61

Browse files
author
Artem Yushkovskiy
authored
Revert "Try fix apex non-working on all presets (#127)"
This reverts commit 6f852fd.
1 parent 6f852fd commit 94bcf61

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

Makefile

+2-18
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ image_pip_list:
3232
e2e_neuro_push:
3333
neuro push $(IMAGE_NAME):built $(TEST_IMAGE)
3434

35-
36-
.PHONY: test_e2e
37-
test_e2e: test_e2e_pytorch test_e2e_tensorflow test_e2e_apex_gpu_small test_e2e_apex_gpu_large test_e2e_dependencies
38-
@echo "e2e tests succeeded!"
39-
4035
TEST_PRESET=cpu-small
4136
TEST_CMD=
4237
.PHONY: _test_e2e
@@ -51,25 +46,14 @@ _test_e2e:
5146

5247
.PHONY: test_e2e_pytorch
5348
test_e2e_pytorch: TEST_CMD=python /var/storage/gpu_pytorch.py
54-
test_e2e_pytorch: TEST_PRESET=gpu-small-p
49+
test_e2e_pytorch: TEST_PRESET=gpu-small
5550
test_e2e_pytorch: _test_e2e
5651

5752
.PHONY: test_e2e_tensorflow
5853
test_e2e_tensorflow: TEST_CMD=python /var/storage/gpu_tensorflow.py
59-
test_e2e_tensorflow: TEST_PRESET=gpu-small-p
54+
test_e2e_tensorflow: TEST_PRESET=gpu-small
6055
test_e2e_tensorflow: _test_e2e
6156

62-
.PHONY: test_e2e_apex_gpu_small
63-
test_e2e_apex_gpu_small: TEST_CMD=python /var/storage/gpu_apex.py
64-
test_e2e_apex_gpu_small: TEST_PRESET=gpu-small-p
65-
test_e2e_apex_gpu_small: _test_e2e
66-
test_e2e_tensorflow: _test_e2e
67-
68-
.PHONY: test_e2e_apex_gpu_large
69-
test_e2e_apex_gpu_large: TEST_CMD=python /var/storage/gpu_apex.py
70-
test_e2e_apex_gpu_large: TEST_PRESET=gpu-large-p
71-
test_e2e_apex_gpu_large: _test_e2e
72-
7357
.PHONY: test_e2e_dependencies
7458
test_e2e_dependencies: TEST_CMD=bash /var/storage/dependencies.sh
7559
test_e2e_dependencies: _test_e2e

targets/python37-jupyter-pytorch-tensorflow-jupyterlab/Dockerfile

-4
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ RUN APT_INSTALL="apt-get install -y --no-install-recommends" && \
171171
# Apex for PyTorch mixed precision training
172172
# ==================================================================
173173

174-
# problem: https://github.com/neuro-inc/ml-kinect-pose-estimation/issues/59
175-
# solution: https://github.com/NVIDIA/apex/issues/842
176-
ENV TORCH_CUDA_ARCH_LIST 6.0;7.0
177-
178174
# Somehow Apex does not use releases, and current master fails to build
179175
# (commit 1f2aa9156547377a023932a1512752c392d9bbdf on Apr 23, 2020).
180176
# So we fix installation to the version Apr 21, 2020

0 commit comments

Comments
 (0)