Skip to content

Commit 8671072

Browse files
author
Shyam Dwaraknath
authored
Merge pull request #149 from ardunn/master
2021 Matminer/ML Update (WIP)
2 parents 8fb187f + b6039d6 commit 8671072

13 files changed

+2331
-9298
lines changed

‎requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ atomate==0.9.9
66
pymongo==3.12.0
77
robocrys==0.2.7
88
crystal-toolkit==2021.4.29
9+
matminer==0.7.3
910
ipywidgets==7.5.1
1011
mpcontribs-client==3.12.0
1112
graphviz==0.17

‎workshop/lessons/08_ml_matminer/matminer-notes.ipynb

+2,314-9,282
Large diffs are not rendered by default.

‎workshop/lessons/08_ml_matminer/resources/amm_logo.png

-139 KB
Binary file not shown.

‎workshop/lessons/08_ml_matminer/resources/mb.png

277 KB
Loading

‎workshop/lessons/08_ml_matminer/resources/mpcontribs.png

209 KB
Loading

‎workshop/lessons/08_ml_matminer/resources/pipe.png

-470 KB
Binary file not shown.

‎workshop/lessons/08_ml_matminer/resources/website_mb.png

144 KB
Loading

‎workshop/lessons/08_ml_matminer/unit-1-exercises-answers.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
],
137137
"metadata": {
138138
"kernelspec": {
139-
"display_name": "Python 3",
139+
"display_name": "Python 3 (ipykernel)",
140140
"language": "python",
141141
"name": "python3"
142142
},
@@ -150,7 +150,7 @@
150150
"name": "python",
151151
"nbconvert_exporter": "python",
152152
"pygments_lexer": "ipython3",
153-
"version": "3.6.7"
153+
"version": "3.7.3"
154154
}
155155
},
156156
"nbformat": 4,

‎workshop/lessons/08_ml_matminer/unit-1-exercises.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
],
115115
"metadata": {
116116
"kernelspec": {
117-
"display_name": "Python 3",
117+
"display_name": "Python 3 (ipykernel)",
118118
"language": "python",
119119
"name": "python3"
120120
},
@@ -128,7 +128,7 @@
128128
"name": "python",
129129
"nbconvert_exporter": "python",
130130
"pygments_lexer": "ipython3",
131-
"version": "3.6.7"
131+
"version": "3.7.3"
132132
}
133133
},
134134
"nbformat": 4,

‎workshop/lessons/08_ml_matminer/unit-2-exercises-answers.ipynb

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"metadata": {},
6565
"outputs": [],
6666
"source": [
67-
"from matminer.featurizers.composition import ElementFraction\n",
67+
"from matminer.featurizers.composition.element import ElementFraction\n",
6868
"\n",
6969
"ep = ElementFraction()\n",
7070
"\n",
@@ -89,7 +89,7 @@
8989
"metadata": {},
9090
"outputs": [],
9191
"source": [
92-
"from matminer.featurizers.structure import DensityFeatures\n",
92+
"from matminer.featurizers.structure.order import DensityFeatures\n",
9393
"\n",
9494
"de = DensityFeatures()\n",
9595
"\n",
@@ -109,7 +109,7 @@
109109
],
110110
"metadata": {
111111
"kernelspec": {
112-
"display_name": "Python 3",
112+
"display_name": "Python 3 (ipykernel)",
113113
"language": "python",
114114
"name": "python3"
115115
},
@@ -123,7 +123,7 @@
123123
"name": "python",
124124
"nbconvert_exporter": "python",
125125
"pygments_lexer": "ipython3",
126-
"version": "3.6.7"
126+
"version": "3.7.3"
127127
}
128128
},
129129
"nbformat": 4,

‎workshop/lessons/08_ml_matminer/unit-2-exercises.ipynb

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"metadata": {},
6464
"outputs": [],
6565
"source": [
66-
"from matminer.featurizers.composition import ElementFraction\n",
66+
"from matminer.featurizers.composition.element import ElementFraction\n",
6767
"\n",
6868
"ep = ElementFraction()\n",
6969
"\n",
@@ -87,7 +87,7 @@
8787
"metadata": {},
8888
"outputs": [],
8989
"source": [
90-
"from matminer.featurizers.structure import DensityFeatures\n",
90+
"from matminer.featurizers.structure.order import DensityFeatures\n",
9191
"\n",
9292
"de = DensityFeatures()\n",
9393
"\n",
@@ -106,7 +106,7 @@
106106
],
107107
"metadata": {
108108
"kernelspec": {
109-
"display_name": "Python 3",
109+
"display_name": "Python 3 (ipykernel)",
110110
"language": "python",
111111
"name": "python3"
112112
},
@@ -120,7 +120,7 @@
120120
"name": "python",
121121
"nbconvert_exporter": "python",
122122
"pygments_lexer": "ipython3",
123-
"version": "3.6.7"
123+
"version": "3.7.3"
124124
}
125125
},
126126
"nbformat": 4,

‎workshop/lessons/08_ml_matminer/unit-3-exercies-answers.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
],
147147
"metadata": {
148148
"kernelspec": {
149-
"display_name": "Python 3",
149+
"display_name": "Python 3 (ipykernel)",
150150
"language": "python",
151151
"name": "python3"
152152
},
@@ -160,7 +160,7 @@
160160
"name": "python",
161161
"nbconvert_exporter": "python",
162162
"pygments_lexer": "ipython3",
163-
"version": "3.6.7"
163+
"version": "3.7.3"
164164
}
165165
},
166166
"nbformat": 4,

‎workshop/lessons/08_ml_matminer/unit-3-exercies.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
],
147147
"metadata": {
148148
"kernelspec": {
149-
"display_name": "Python 3",
149+
"display_name": "Python 3 (ipykernel)",
150150
"language": "python",
151151
"name": "python3"
152152
},
@@ -160,7 +160,7 @@
160160
"name": "python",
161161
"nbconvert_exporter": "python",
162162
"pygments_lexer": "ipython3",
163-
"version": "3.6.7"
163+
"version": "3.7.3"
164164
}
165165
},
166166
"nbformat": 4,

0 commit comments

Comments
 (0)