File tree Expand file tree Collapse file tree 2 files changed +8
-0
lines changed Expand file tree Collapse file tree 2 files changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -63,6 +63,7 @@ WORKDIR /
63
63
COPY $framework_installable .
64
64
COPY $framework_support_installable .
65
65
66
+ <<<<<<< HEAD
66
67
<<<<<<< HEAD
67
68
RUN pip install --no-cache-dir -U \
68
69
keras==2.2.4 \
@@ -73,6 +74,9 @@ RUN pip install --no-cache-dir -U \
73
74
&& pip install --force-reinstall --no-cache-dir -U $framework_installable \
74
75
=======
75
76
RUN pip install --no-cache-dir $framework_installable \
77
+ =======
78
+ RUN pip install --no-cache-dir -U $framework_installable \
79
+ >>>>>>> GPU fix (#117)
76
80
$framework_support_installable\
77
81
"sagemaker-tensorflow>=1.11,<1.12" \
78
82
>>>>>>> Add distributed training support (#98)
Original file line number Diff line number Diff line change @@ -84,6 +84,7 @@ WORKDIR /
84
84
COPY $framework_installable .
85
85
COPY $framework_support_installable .
86
86
87
+ <<<<<<< HEAD
87
88
<<<<<<< HEAD
88
89
RUN pip install --no-cache-dir -U \
89
90
keras==2.2.4 \
@@ -94,6 +95,9 @@ RUN pip install --no-cache-dir -U \
94
95
&& pip install --force-reinstall --no-cache-dir -U $framework_installable \
95
96
=======
96
97
RUN pip install --no-cache-dir $framework_installable \
98
+ =======
99
+ RUN pip install --no-cache-dir -U $framework_installable \
100
+ >>>>>>> GPU fix (#117)
97
101
$framework_support_installable\
98
102
"sagemaker-tensorflow>=1.11,<1.12" \
99
103
>>>>>>> Add distributed training support (#98)
You can’t perform that action at this time.
0 commit comments