Skip to content

Commit 9c70809

Browse files
jplottsjplotts
committed
Enable kernels to be pinned to the original docker image
Also applies original pinning type to the Computer Vision and Deep Learning tracks, which would be broken by the Keras 3 upgrade. These have already been pinned via direct DB update, but this change is needed to make sure that they don't revert back to latest during the next push. http://b/324889848
1 parent 940f894 commit 9c70809

File tree

3 files changed

+110
-81
lines changed

3 files changed

+110
-81
lines changed

‎notebooks/computer_vision/track_meta.py

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,73 +24,85 @@
2424
lesson_idx=0,
2525
type='tutorial',
2626
enable_gpu=True,
27+
docker_image_pinning_type="original",
2728
),
2829
dict(
2930
filename="ex1.ipynb",
3031
lesson_idx=0,
3132
type='exercise',
3233
enable_gpu=True,
33-
scriptid=10781907
34+
scriptid=10781907,
35+
docker_image_pinning_type="original",
3436
),
3537
dict(
3638
filename="tut2.ipynb",
3739
lesson_idx=1,
3840
type='tutorial',
41+
docker_image_pinning_type="original",
3942
),
4043
dict(
4144
filename="ex2.ipynb",
4245
lesson_idx=1,
4346
type='exercise',
44-
scriptid=11989557
47+
scriptid=11989557,
48+
docker_image_pinning_type="original",
4549
),
4650
dict(
4751
filename="tut3.ipynb",
4852
lesson_idx=2,
4953
type='tutorial',
54+
docker_image_pinning_type="original",
5055
),
5156
dict(
5257
filename="ex3.ipynb",
5358
lesson_idx=2,
5459
type='exercise',
55-
scriptid=11989559
60+
scriptid=11989559,
61+
docker_image_pinning_type="original",
5662
),
5763
dict(
5864
filename="tut4.ipynb",
5965
lesson_idx=3,
6066
type='tutorial',
67+
docker_image_pinning_type="original",
6168
),
6269
dict(
6370
filename="ex4.ipynb",
6471
lesson_idx=3,
6572
type='exercise',
66-
scriptid=12400209
73+
scriptid=12400209,
74+
docker_image_pinning_type="original",
6775
),
6876
dict(
6977
filename="tut5.ipynb",
7078
lesson_idx=4,
7179
type='tutorial',
7280
enable_gpu=True,
81+
docker_image_pinning_type="original",
7382
),
7483
dict(
7584
filename="ex5.ipynb",
7685
lesson_idx=4,
7786
type='exercise',
7887
enable_gpu=True,
79-
scriptid=11989565
88+
scriptid=11989565,
89+
docker_image_pinning_type="original",
8090
),
8191
dict(
8292
filename="tut6.ipynb",
8393
lesson_idx=5,
8494
type='tutorial',
8595
enable_gpu=True,
96+
docker_image_pinning_type="original",
8697
),
8798
dict(
8899
filename="ex6.ipynb",
89100
lesson_idx=5,
90101
type='exercise',
91102
enable_gpu=True,
92-
scriptid=11991328
93-
),
103+
scriptid=11991328,
104+
docker_image_pinning_type="original",
105+
),
94106
]
95107

96108
for nb in notebooks:

‎notebooks/deep_learning/track_meta.py

Lines changed: 88 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -2,150 +2,165 @@
22
author_username='dansbecker',
33
course_name='Deep Learning',
44
course_url='https://www.kaggle.com/learn/deep-learning',
5-
course_forum_url='https://www.kaggle.com/learn-forum/161321'
5+
course_forum_url='https://www.kaggle.com/learn-forum/161321',
66
)
77

8-
lessons = [ {'topic': topic_name} for topic_name in
9-
[
10-
'Intro to Deep Learning and Computer Vision',
11-
'Building Models from Convolutions',
12-
'TensorFlow programming',
13-
'Transfer Learning',
14-
'Data Augmentation',
15-
'A Deeper Understanding of Deep Learning',
16-
'Deep Learning from Scratch',
17-
'Dropout and Strides for Larger Models',
18-
'Create Your First Submission'
19-
]
20-
]
8+
lessons = [ {'topic': topic_name} for topic_name in [
9+
'Intro to Deep Learning and Computer Vision',
10+
'Building Models from Convolutions',
11+
'TensorFlow programming',
12+
'Transfer Learning',
13+
'Data Augmentation',
14+
'A Deeper Understanding of Deep Learning',
15+
'Deep Learning from Scratch',
16+
'Dropout and Strides for Larger Models',
17+
'Create Your First Submission'
18+
]
19+
]
2120

2221
notebooks = [
2322
dict(
2423
filename='tut1_intro.ipynb',
2524
lesson_idx=0,
2625
type='tutorial',
27-
),
26+
docker_image_pinning_type="original",
27+
),
2828
dict(
29-
filename='ex1_convolutions.ipynb',
30-
lesson_idx=0,
31-
type='exercise',
32-
scriptid=499266,
33-
dataset_sources = ["keras/resnet50"],
34-
competition_sources = ["dog-breed-identification"],
35-
),
29+
filename='ex1_convolutions.ipynb',
30+
lesson_idx=0,
31+
type='exercise',
32+
scriptid=499266,
33+
dataset_sources=["keras/resnet50"],
34+
competition_sources=["dog-breed-identification"],
35+
docker_image_pinning_type="original",
36+
),
3637
dict(
3738
filename='tut2_building_models_from_convolutions.ipynb',
3839
lesson_idx=1,
3940
type='tutorial',
40-
),
41+
docker_image_pinning_type="original",
42+
),
4143
dict(
4244
filename='tut3_programming_tf_and_keras.ipynb',
4345
lesson_idx=2,
4446
type='tutorial',
45-
dataset_sources = ["keras/resnet50"],
46-
competition_sources = ["dog-breed-identification"],
47+
dataset_sources=["keras/resnet50"],
48+
competition_sources=["dog-breed-identification"],
49+
docker_image_pinning_type="original",
4750
),
4851
dict(
4952
filename='ex3_programming_tf_and_keras.ipynb',
5053
lesson_idx=2,
5154
type='exercise',
52-
enable_gpu=True,
53-
scriptid=521452,
54-
dataset_sources = [
55-
"alexisbcook/resnet50",
56-
"alexisbcook/vgg16",
57-
"dansbecker/hot-dog-not-hot-dog"
58-
],
55+
enable_gpu=True,
56+
scriptid=521452,
57+
dataset_sources = [
58+
"alexisbcook/resnet50",
59+
"alexisbcook/vgg16",
60+
"dansbecker/hot-dog-not-hot-dog"
61+
],
62+
docker_image_pinning_type="original",
5963
),
6064
dict(
6165
filename='tut4_transfer_learning.ipynb',
6266
lesson_idx=3,
6367
type='tutorial',
64-
dataset_sources = [
65-
"keras/resnet50",
66-
"dansbecker/urban-and-rural-photos"
67-
],
68+
dataset_sources = [
69+
"keras/resnet50",
70+
"dansbecker/urban-and-rural-photos"
71+
],
72+
docker_image_pinning_type="original",
6873
),
6974
dict(
7075
filename='ex4_transfer_learning.ipynb',
7176
lesson_idx=3,
7277
type='exercise',
73-
scriptid=532365,
74-
dataset_sources = [
75-
"alexisbcook/resnet50",
76-
"dansbecker/dogs-gone-sideways"
77-
],
78-
enable_gpu=True,
78+
scriptid=532365,
79+
dataset_sources = [
80+
"alexisbcook/resnet50",
81+
"dansbecker/dogs-gone-sideways"
82+
],
83+
enable_gpu=True,
84+
docker_image_pinning_type="original",
7985
),
8086
dict(
8187
filename='tut5_data_augmentation.ipynb',
8288
lesson_idx=4,
8389
type='tutorial',
84-
dataset_sources = [
85-
"keras/resnet50",
86-
"dansbecker/urban-and-rural-photos",
87-
],
90+
dataset_sources = [
91+
"keras/resnet50",
92+
"dansbecker/urban-and-rural-photos",
93+
],
94+
docker_image_pinning_type="original",
8895
),
8996
dict(
9097
filename='ex5_data_augmentation.ipynb',
9198
lesson_idx=4,
9299
type='exercise',
93-
enable_gpu=True,
94-
scriptid=536195,
100+
enable_gpu=True,
101+
scriptid=536195,
95102
dataset_sources = [
96-
"alexisbcook/resnet50",
97-
"dansbecker/dogs-gone-sideways"
98-
],
99-
),
103+
"alexisbcook/resnet50",
104+
"dansbecker/dogs-gone-sideways"
105+
],
106+
docker_image_pinning_type="original",
107+
),
100108
dict(
101109
filename='tut6_deep_understanding.ipynb',
102110
lesson_idx=5,
103111
type='tutorial',
104-
),
112+
docker_image_pinning_type="original",
113+
),
105114
dict(filename='tut7_dl_from_scratch.ipynb',
106115
lesson_idx=6,
107116
type='tutorial',
108-
dataset_sources = ['zalando-research/fashionmnist'],
109-
competition_sources=['digit-recognizer'],
110-
),
117+
dataset_sources=['zalando-research/fashionmnist'],
118+
competition_sources=['digit-recognizer'],
119+
docker_image_pinning_type="original",
120+
),
111121
dict(
112122
filename='ex7_from_scratch.ipynb',
113123
lesson_idx=6,
114-
enable_gpu=True,
124+
enable_gpu=True,
115125
type='exercise',
116126
scriptid=574269,
117-
competition_sources=['digit-recognizer'],
118-
dataset_sources = ['zalando-research/fashionmnist'],
119-
),
127+
competition_sources=['digit-recognizer'],
128+
dataset_sources=['zalando-research/fashionmnist'],
129+
docker_image_pinning_type="original",
130+
),
120131
dict(
121132
filename='tut8_dropout_and_strides.ipynb',
122133
lesson_idx=7,
123134
type='tutorial',
124-
competition_sources=['digit-recognizer'],
125-
dataset_sources = ['zalando-research/fashionmnist'],
126-
),
135+
competition_sources=['digit-recognizer'],
136+
dataset_sources=['zalando-research/fashionmnist'],
137+
docker_image_pinning_type="original",
138+
),
127139
dict(
128140
filename='ex8_dropout_strides.ipynb',
129141
lesson_idx=7,
130-
enable_gpu=True,
142+
enable_gpu=True,
131143
type='exercise',
132-
scriptid=663261,
133-
competition_sources=['digit-recognizer'],
134-
dataset_sources = ['zalando-research/fashionmnist'],
135-
),
144+
scriptid=663261,
145+
competition_sources=['digit-recognizer'],
146+
dataset_sources=['zalando-research/fashionmnist'],
147+
docker_image_pinning_type="original",
148+
),
136149
dict(
137150
filename='tut_tpus.ipynb',
138151
lesson_idx=8,
139152
type='tutorial',
140153
competition_sources=['tpu-getting-started'],
141-
enable_internet=True
142-
),
154+
enable_internet=True,
155+
docker_image_pinning_type="original",
156+
),
143157
dict(
144158
filename='ex_tpus.ipynb',
145159
lesson_idx=8,
146160
type='exercise',
147161
scriptid=10204702,
148162
competition_sources=['tpu-getting-started'],
149-
enable_internet=True
150-
)
151-
]
163+
enable_internet=True,
164+
docker_image_pinning_type="original",
165+
)
166+
]

‎notebooks/nb_utils/track_metadata.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ class Notebook(object):
131131
def __init__(self, cfg, filename, type, author=None, title=None, lesson=None,
132132
slug=None, scriptid=1, kernel_sources=(), dataset_sources=(),
133133
competition_sources=(), keywords=(), enable_gpu=False, enable_internet=None,
134+
docker_image_pinning_type=None
134135
):
135136
self.cfg = cfg
136137
self.filename = filename
@@ -170,6 +171,7 @@ def __init__(self, cfg, filename, type, author=None, title=None, lesson=None,
170171
self.keywords = list(keywords)
171172
self.enable_gpu = bool(enable_gpu)
172173
self.enable_internet = enable_internet
174+
self.docker_image_pinning_type = docker_image_pinning_type
173175

174176
@staticmethod
175177
def _topic_to_title(topic):
@@ -221,5 +223,5 @@ def kernel_metadata(self, cfg):
221223
competition_sources=sorted(self.competition_sources),
222224
kernel_sources=sorted(self.kernel_sources),
223225
keywords=sorted(self.keywords),
224-
docker_image_pinning_type="latest",
226+
docker_image_pinning_type="latest" if self.docker_image_pinning_type is None else self.docker_image_pinning_type,
225227
)

0 commit comments

Comments
 (0)