Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh notebooks for chore/debug_decision_tree_classifier_notebook #652

Closed
wants to merge 1 commit into from
Closed

Refresh notebooks for chore/debug_decision_tree_classifier_notebook #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/advanced_examples/ClassifierComparison.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions docs/advanced_examples/ClientServer.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@
"name": "stdout",
"output_type": "stream",
"text": [
"total 152\r\n",
"-rw-r--r-- 1 romanbredehoft staff 59K Apr 25 14:02 client.zip\r\n",
"-rw-r--r-- 1 romanbredehoft staff 9.2K Apr 25 14:02 server.zip\r\n",
"-rw-r--r-- 1 romanbredehoft staff 76B Apr 25 14:02 versions.json\r\n"
"total 76K\r\n",
"-rw-r--r-- 1 root root 59K Apr 25 17:26 client.zip\r\n",
"-rw-r--r-- 1 root root 9.5K Apr 25 17:26 server.zip\r\n",
"-rw-r--r-- 1 root root 75 Apr 25 17:26 versions.json\r\n"
]
}
],
Expand Down Expand Up @@ -176,8 +176,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"total 24\r\n",
"-rw-r--r-- 1 romanbredehoft staff 9.2K Apr 25 14:02 server.zip\r\n"
"total 12K\r\n",
"-rw-r--r-- 1 root root 9.5K Apr 25 17:26 server.zip\r\n"
]
}
],
Expand All @@ -196,8 +196,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"total 120\r\n",
"-rw-r--r-- 1 romanbredehoft staff 59K Apr 25 14:02 client.zip\r\n"
"total 60K\r\n",
"-rw-r--r-- 1 root root 59K Apr 25 17:26 client.zip\r\n"
]
}
],
Expand All @@ -223,7 +223,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"KeySetCache: miss, regenerating /var/folders/p6/8g0g4d5s4y1bzz95sw3ch7qw0000gn/T/tmpgv8ih42r/6288456596652981602\n"
"KeySetCache: miss, regenerating /tmp/tmprj2c3x99/6318749875182965247\n"
]
}
],
Expand Down Expand Up @@ -271,7 +271,7 @@
"output_type": "stream",
"text": [
"Encrypted data is 1538.10 times larger than the clear data\n",
"The average execution time is 0.39 seconds per sample.\n"
"The average execution time is 0.70 seconds per sample.\n"
]
}
],
Expand Down
1,524 changes: 1,250 additions & 274 deletions docs/advanced_examples/ConvolutionalNeuralNetwork.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/advanced_examples/DecisionTreeClassifier.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"output_type": "stream",
"text": [
"Best hyper parameters: {'max_depth': None, 'max_features': None, 'min_samples_leaf': 10, 'min_samples_split': 100}\n",
"Best score: 0.9300808556256511\n"
"Best score: 0.9302072868553687\n"
]
}
],
Expand Down Expand Up @@ -279,7 +279,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Execution time: 0.51 seconds per sample\n"
"Execution time: 0.53 seconds per sample\n"
]
}
],
Expand Down
53 changes: 31 additions & 22 deletions docs/advanced_examples/DecisionTreeRegressor.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
"output_type": "stream",
"text": [
"Using ConcreteML version 1.5.0\n",
"With Python version 3.10.11 (v3.10.11:7d4cc5aa85, Apr 4 2023, 19:05:19) [Clang 13.0.0 (clang-1300.0.29.30)]\n"
"With Python version 3.8.18 (default, Aug 28 2023, 08:26:46) \n",
"[GCC 9.4.0]\n"
]
}
],
Expand Down Expand Up @@ -243,7 +244,15 @@
"execution_count": 6,
"id": "8069097d",
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Training on 5100 samples in 21.3647 seconds\n"
]
}
],
"source": [
"default_model = ConcreteDecisionTreeRegressor(criterion=\"absolute_error\", n_bits=6, random_state=42)\n",
"\n",
Expand All @@ -254,7 +263,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 7,
"id": "e286d33c",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -288,7 +297,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 8,
"id": "3b076c44",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -349,7 +358,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 9,
"id": "1e64ee0b-76af-4e6a-a1d7-31048115a6e7",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -396,7 +405,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 10,
"id": "20431f4b",
"metadata": {},
"outputs": [],
Expand All @@ -414,7 +423,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 11,
"id": "07e5cffc",
"metadata": {},
"outputs": [],
Expand All @@ -424,7 +433,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 12,
"id": "177e073d",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -495,15 +504,15 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 13,
"id": "6ca2fd2c",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Compiled with 5100 samples in 83.1571 seconds\n"
"Compiled with 500 samples in 10.8320 seconds\n"
]
}
],
Expand All @@ -517,7 +526,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 14,
"id": "132936f9",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -551,7 +560,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 15,
"id": "cb045438",
"metadata": {},
"outputs": [],
Expand All @@ -563,15 +572,15 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 16,
"id": "904f585b",
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Execution time: 7.52 seconds per sample\n"
"Execution time: 6.50 seconds per sample\n"
]
}
],
Expand All @@ -595,7 +604,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 17,
"id": "07fe03ba",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -635,7 +644,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 18,
"id": "15008ad0-05d0-4ec2-91ea-c4be2efbc05b",
"metadata": {},
"outputs": [
Expand All @@ -659,16 +668,16 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Circuit compiled with 5100 samples in 114.1739 seconds\n",
"Circuit compiled with 5100 samples in 121.3833 seconds\n",
"Generating a key for an 9-bit circuit\n",
"Key generation time: 0.41 seconds\n"
"Key generation time: 0.42 seconds\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Execution time: 8.35 seconds per sample\n",
"Execution time: 9.86 seconds per sample\n",
"\n",
"N_BITS = 8\n",
"----------\n"
Expand All @@ -686,16 +695,16 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Circuit compiled with 5100 samples in 123.1487 seconds\n",
"Circuit compiled with 5100 samples in 84.6457 seconds\n",
"Generating a key for an 10-bit circuit\n",
"Key generation time: 0.41 seconds\n"
"Key generation time: 0.42 seconds\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Execution time: 7.80 seconds per sample\n",
"Execution time: 7.36 seconds per sample\n",
"\n"
]
}
Expand Down
32 changes: 16 additions & 16 deletions docs/advanced_examples/EncryptedPandas.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,31 +492,31 @@
" </thead>\n",
" <tbody>\n",
" <tr>\n",
" <td>..c0e7495b02..</td>\n",
" <td>..c9fe2ab2b6..</td>\n",
" <td>..5da7a2af7f..</td>\n",
" <td>..4817831af6..</td>\n",
" <td>..3417c6ee62..</td>\n",
" <td>..c422afa8dd..</td>\n",
" <td>..b26cd56fd6..</td>\n",
" <td>..cf027df1d0..</td>\n",
" </tr>\n",
" <tr>\n",
" <td>..bd9797adb8..</td>\n",
" <td>..414c3958e0..</td>\n",
" <td>..46969bfe5f..</td>\n",
" <td>..ae8a967d66..</td>\n",
" <td>..5845123f13..</td>\n",
" <td>..887e3fdadb..</td>\n",
" <td>..6f13c5d7dd..</td>\n",
" <td>..781923cba0..</td>\n",
" </tr>\n",
" <tr>\n",
" <td>..8f5fe5220d..</td>\n",
" <td>..dae7c10e46..</td>\n",
" <td>..d118420501..</td>\n",
" <td>..4df98945c3..</td>\n",
" <td>..5d6430a19d..</td>\n",
" <td>..1fd59bd01a..</td>\n",
" <td>..1265173c24..</td>\n",
" <td>..34a54f8a14..</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>"
],
"text/plain": [
" index day time size\n",
"..c0e7495b02.. ..c9fe2ab2b6.. ..5da7a2af7f.. ..4817831af6..\n",
"..bd9797adb8.. ..414c3958e0.. ..46969bfe5f.. ..ae8a967d66..\n",
"..8f5fe5220d.. ..dae7c10e46.. ..d118420501.. ..4df98945c3.."
"..3417c6ee62.. ..c422afa8dd.. ..b26cd56fd6.. ..cf027df1d0..\n",
"..5845123f13.. ..887e3fdadb.. ..6f13c5d7dd.. ..781923cba0..\n",
"..5d6430a19d.. ..1fd59bd01a.. ..1265173c24.. ..34a54f8a14.."
]
},
"execution_count": 9,
Expand Down Expand Up @@ -584,7 +584,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Total execution time: 6.82s\n"
"Total execution time: 8.19s\n"
]
}
],
Expand Down
Loading
Loading