Skip to content

Commit 06b6ba3

Browse files
zachgkbhupendrasingh
authored andcommitted
Fix typo
1 parent 290810d commit 06b6ba3

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

tests/unit/sagemaker/image_uris/test_djl.py

-10
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,8 @@
4242
"us-west-1": "763104351884",
4343
"us-west-2": "763104351884",
4444
}
45-
<<<<<<< HEAD
46-
DJL_DEEPSPEED_VERSIONS = ["0.23.0", "0.22.1", "0.21.0", "0.20.0", "0.19.0"]
47-
DJL_FASTERTRANSFORMER_VERSIONS = ["0.23.0", "0.22.1", "0.21.0"]
48-
DJL_NEURONX_VERSIONS = ["0.23.0", "0.22.1"]
49-
=======
5045
DJL_DEEPSPEED_VERSIONS = ["0.24.0", "0.23.0", "0.22.1", "0.21.0", "0.20.0", "0.19.0"]
5146
DJL_FASTERTRANSFORMER_VERSIONS = ["0.24.0", "0.23.0", "0.22.1", "0.21.0"]
52-
>>>>>>> cc09ef13 (change: Updates for DJL 0.24.0 Release)
5347
DJL_NEURONX_VERSIONS = ["0.24.0", "0.23.0", "0.22.1"]
5448
DJL_VERSIONS_TO_FRAMEWORK = {
5549
"0.19.0": {"djl-deepspeed": "deepspeed0.7.3-cu113"},
@@ -68,13 +62,9 @@
6862
"djl-fastertransformer": "fastertransformer5.3.0-cu118",
6963
"djl-neuronx": "neuronx-sdk2.12.0",
7064
},
71-
<<<<<<< HEAD
7265
"0.24.0": {
73-
=======
74-
"0.240": {
7566
"djl-deepspeed": "deepspeed0.10.0-cu118",
7667
"djl-fastertransformer": "fastertransformer5.3.0-cu118",
77-
>>>>>>> cc09ef13 (change: Updates for DJL 0.24.0 Release)
7868
"djl-neuronx": "neuronx-sdk2.14.1",
7969
},
8070
}

0 commit comments

Comments
 (0)