From 096e3c7ffb700c7def5105feaf60f66bd1cf3db0 Mon Sep 17 00:00:00 2001
From: Jean-Luc Parouty <Jean-Luc.Parouty@simap.grenoble-inp.fr>
Date: Mon, 4 Mar 2024 15:25:29 +0100
Subject: [PATCH] Minor corrections - cpu+gpu : tests ok (v3.0.9)
---
AE.Keras3/03-AE-with-MNIST-post.ipynb | 2 +-
DCGAN.Lightning/01-DCGAN-PL.ipynb | 11 --
VAE.Keras3/03-VAE-with-MNIST-post.ipynb | 2 +-
fidle/ci/cpu-default.yml | 134 +++++++++++++++++++++++-
4 files changed, 135 insertions(+), 14 deletions(-)
diff --git a/AE.Keras3/03-AE-with-MNIST-post.ipynb b/AE.Keras3/03-AE-with-MNIST-post.ipynb
index 3ecc33f..2d51525 100644
--- a/AE.Keras3/03-AE-with-MNIST-post.ipynb
+++ b/AE.Keras3/03-AE-with-MNIST-post.ipynb
@@ -250,7 +250,7 @@
"metadata": {},
"outputs": [],
"source": [
- "n_show = 20000\n",
+ "n_show = min( 20000, len(clean_data) )\n",
"\n",
"# ---- Select images\n",
"\n",
diff --git a/DCGAN.Lightning/01-DCGAN-PL.ipynb b/DCGAN.Lightning/01-DCGAN-PL.ipynb
index cfb550e..8b6fbff 100644
--- a/DCGAN.Lightning/01-DCGAN-PL.ipynb
+++ b/DCGAN.Lightning/01-DCGAN-PL.ipynb
@@ -393,17 +393,6 @@
"gan = GAN.load_from_checkpoint(f'{run_dir}/models/bestModel.ckpt')"
]
},
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {
- "tags": []
- },
- "outputs": [],
- "source": [
- "torch.cuda.current_device()"
- ]
- },
{
"cell_type": "code",
"execution_count": null,
diff --git a/VAE.Keras3/03-VAE-with-MNIST-post.ipynb b/VAE.Keras3/03-VAE-with-MNIST-post.ipynb
index 1db7d95..0dc3527 100644
--- a/VAE.Keras3/03-VAE-with-MNIST-post.ipynb
+++ b/VAE.Keras3/03-VAE-with-MNIST-post.ipynb
@@ -181,7 +181,7 @@
"metadata": {},
"outputs": [],
"source": [
- "n_show = 20000\n",
+ "n_show = min( 20000, len(x_data) )\n",
"\n",
"# ---- Select images\n",
"\n",
diff --git a/fidle/ci/cpu-default.yml b/fidle/ci/cpu-default.yml
index 3aae587..af25720 100644
--- a/fidle/ci/cpu-default.yml
+++ b/fidle/ci/cpu-default.yml
@@ -2,7 +2,7 @@ campain:
version: '1.0'
description: Notebook test on CPU, default settings.
directory: ./campains/cpu-default
- existing_notebook: 'remove' # remove|skip
+ existing_notebook: 'skip' # remove|skip
report_template: 'fidle' # fidle|default
timeout: 6000
@@ -193,6 +193,138 @@ K3LADYB1:
batch_size: default
epochs: default
+#
+# ------------ AE.Keras3
+#
+K3AE1:
+ notebook: AE.Keras3/01-Prepare-MNIST-dataset.ipynb
+ overrides:
+ prepared_dataset: default
+ scale: 0.1
+ progress_verbosity: default
+
+K3AE2:
+ notebook: AE.Keras3/02-AE-with-MNIST.ipynb
+ after: K3AE1
+ overrides:
+ prepared_dataset: default
+ dataset_seed: default
+ scale: 1
+ latent_dim: default
+ train_prop: default
+ batch_size: default
+ epochs: 4
+ fit_verbosity: default
+
+K3AE3:
+ notebook: AE.Keras3/03-AE-with-MNIST-post.ipynb
+ after: K3AE2
+ overrides:
+ prepared_dataset: default
+ dataset_seed: default
+ scale: 1
+ train_prop: default
+
+K3AE4:
+ notebook: AE.Keras3/04-ExtAE-with-MNIST.ipynb
+ after: K3AE1
+ overrides:
+ prepared_dataset: default
+ dataset_seed: default
+ scale: 1
+ train_prop: default
+ batch_size: default
+ epochs: 4
+ fit_verbosity: default
+
+K3AE5:
+ notebook: AE.Keras3/05-ExtAE-with-MNIST.ipynb
+ after: K3AE1
+ overrides:
+ prepared_dataset: default
+ dataset_seed: default
+ scale: 1
+ train_prop: default
+ batch_size: default
+ epochs: 4
+ fit_verbosity: default
+
+#
+# ------------ VAE.Keras3
+#
+K3VAE1:
+ notebook: VAE.Keras3/01-VAE-with-MNIST-LossLayer.ipynb
+ overrides:
+ latent_dim: default
+ loss_weights: default
+ scale: 0.1
+ seed: default
+ batch_size: default
+ epochs: 4
+ fit_verbosity: default
+
+K3VAE2:
+ notebook: VAE.Keras3/02-VAE-with-MNIST.ipynb
+ overrides:
+ latent_dim: default
+ loss_weights: default
+ scale: 0.1
+ seed: default
+ batch_size: default
+ epochs: 4
+ fit_verbosity: default
+
+K3VAE3:
+ notebook: VAE.Keras3/03-VAE-with-MNIST-post.ipynb
+ after: K3VAE2
+ overrides:
+ scale: 0.1
+ seed: default
+ models_dir: default
+
+#
+# ------------ DCGAN.Lightning
+#
+PLSHEEP3:
+ notebook: DCGAN.Lightning/01-DCGAN-PL.ipynb
+ overrides:
+ latent_dim: default
+ gan_name: GAN
+ generator_name: default
+ discriminator_name: default
+ epochs: 4
+ lr: default
+ b1: default
+ b2: default
+ batch_size: default
+ num_img: default
+ fit_verbosity: default
+ dataset_file: default
+ data_shape: default
+ scale: 0.001
+ num_workers: default
+
+PLSHEEP3:
+ notebook: DCGAN.Lightning/01-DCGAN-PL.ipynb
+ overrides:
+ latent_dim: default
+ gan_name: WGANGP
+ generator_name: default
+ discriminator_name: default
+ epochs: 4
+ lr: default
+ b1: default
+ b2: default
+ batch_size: default
+ num_img: default
+ fit_verbosity: default
+ dataset_file: default
+ data_shape: default
+ scale: 0.001
+ num_workers: default
+
+
+
#
# ------------ Misc
#
--
GitLab