Skip to content

Commit 9378ca5

Browse files
authored
pin pytorch_lighting to 1.3.8 (horovod#3117)
Fix compatibility for torch==1.4.0 Signed-off-by: Chongxiao Cao <[email protected]>
1 parent 1a672ed commit 9378ca5

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

docker-compose.test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
TENSORFLOW_PACKAGE: tensorflow-cpu==2.6.0
1313
KERAS_PACKAGE: None
1414
PYTORCH_PACKAGE: torch==1.9.0+cpu
15-
PYTORCH_LIGHTNING_PACKAGE: pytorch-lightning==1.3.7.post0
15+
PYTORCH_LIGHTNING_PACKAGE: pytorch-lightning==1.3.8
1616
TORCHVISION_PACKAGE: torchvision==0.10.0+cpu
1717
MXNET_PACKAGE: mxnet==1.8.0.post0
1818
PYSPARK_PACKAGE: pyspark==3.1.2
@@ -57,7 +57,7 @@ services:
5757
TENSORFLOW_PACKAGE: tensorflow==1.15.5
5858
KERAS_PACKAGE: keras==2.2.4
5959
PYTORCH_PACKAGE: torch==1.6.0+cpu
60-
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.1.0
60+
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.3.8
6161
TORCHVISION_PACKAGE: torchvision==0.7.0+cpu
6262
MXNET_PACKAGE: mxnet==1.5.1.post0
6363
# there is no mxnet-1.6.0.post0 and mxnet-1.6.0 does not work with horovod
@@ -146,7 +146,7 @@ services:
146146
TENSORFLOW_PACKAGE: tensorflow-gpu==2.4.3
147147
KERAS_PACKAGE: keras==2.3.1
148148
PYTORCH_PACKAGE: torch==1.7.1+cu101
149-
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.2.9
149+
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.3.8
150150
TORCHVISION_PACKAGE: torchvision==0.8.2+cu101
151151
MXNET_PACKAGE: mxnet-cu101==1.6.0.post0
152152
# we additionally test the previous framework combination (CUDA 10.x) with mxnet 1.7.x
@@ -161,7 +161,7 @@ services:
161161
TENSORFLOW_PACKAGE: tensorflow-gpu==2.4.3
162162
KERAS_PACKAGE: keras==2.3.1
163163
PYTORCH_PACKAGE: torch==1.7.1+cu101
164-
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.2.9
164+
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.3.8
165165
TORCHVISION_PACKAGE: torchvision==0.8.2+cu101
166166
MXNET_PACKAGE: mxnet-cu101==1.7.0.post1
167167
# we deviate from mxnet1_7_0_p2 here as other frameworks target CUDA 11.x and
@@ -176,7 +176,7 @@ services:
176176
TENSORFLOW_PACKAGE: tensorflow-gpu==2.5.1
177177
KERAS_PACKAGE: None
178178
PYTORCH_PACKAGE: torch==1.8.1+cu111
179-
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.2.9
179+
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.3.8
180180
TORCHVISION_PACKAGE: torchvision==0.9.1+cu111
181181
MXNET_PACKAGE: mxnet-cu112==1.8.0.post0
182182
test-gpu-openmpi-gloo-py3_8-tf2_6_0-keras_none-torch1_9_0-mxnet1_8_0_p0-pyspark3_1_2:
@@ -190,7 +190,7 @@ services:
190190
TENSORFLOW_PACKAGE: tensorflow-gpu==2.6.0
191191
KERAS_PACKAGE: None
192192
PYTORCH_PACKAGE: torch==1.9.0+cu111
193-
PYTORCH_LIGHTNING_PACKAGE: pytorch-lightning==1.3.7.post0
193+
PYTORCH_LIGHTNING_PACKAGE: pytorch-lightning==1.3.8
194194
TORCHVISION_PACKAGE: torchvision==0.10.0+cu111
195195
MXNET_PACKAGE: mxnet-cu112==1.8.0.post0
196196
test-gpu-gloo-py3_8-tfhead-keras_none-torchhead-mxnethead-pyspark3_1_2:
@@ -203,7 +203,7 @@ services:
203203
TENSORFLOW_PACKAGE: tf-nightly-gpu
204204
KERAS_PACKAGE: None
205205
PYTORCH_PACKAGE: torch-nightly-cu111
206-
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.2.9
206+
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.3.8
207207
TORCHVISION_PACKAGE: torchvision
208208
MXNET_PACKAGE: mxnet-nightly-cu112
209209

@@ -218,7 +218,7 @@ services:
218218
TENSORFLOW_PACKAGE: tensorflow-gpu==2.6.0
219219
KERAS_PACKAGE: None
220220
PYTORCH_PACKAGE: torch==1.9.0+cu111
221-
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.3.7.post0
221+
PYTORCH_LIGHTNING_PACKAGE: pytorch_lightning==1.3.8
222222
TORCHVISION_PACKAGE: torchvision==0.10.0+cu111
223223
MXNET_PACKAGE: mxnet-cu112==1.8.0.post0
224224
HOROVOD_BUILD_FLAGS: ""

docs/spark.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Horovod Spark Estimators additionally require at least one of these combinations
4242

4343
* ``tensorflow-gpu >= 1.12.0`` or ``tensorflow >= 1.12.0`` (for ``KerasEstimator``)
4444
* ``torch >= 1.0.0`` and ``tensorboard >= 1.14.0`` (for ``TorchEstimator``)
45-
* ``torch >= 1.4.0`` and ``pytorch_lightning >= 1.4.1`` (for ``LightningEstimator``)
45+
* ``torch >= 1.4.0`` and ``pytorch_lightning >= 1.3.8`` (for ``LightningEstimator``)
4646

4747

4848
Horovod Spark Estimators

horovod/spark/lightning/estimator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import torch
4747
import torch.utils.data
4848

49-
MIN_PL_VERSION = "1.4.1"
49+
MIN_PL_VERSION = "1.3.8"
5050

5151

5252
def _torch_param_serialize(param_name, param_val):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def build_extensions(self):
145145
'keras==2.3.1',
146146
'torch==1.4.0',
147147
'torchvision==0.5.0',
148-
'pytorch_lightning>=1.4.1',
148+
'pytorch_lightning>=1.3.8',
149149
'mxnet==1.5.0',
150150
'pyspark==3.0.1'] + spark_require_list
151151
# torchvision 0.5.0 depends on torch==1.4.0

0 commit comments

Comments
 (0)