From 7148efaa0e3e762d827baa142e8ae9417cec856e Mon Sep 17 00:00:00 2001 From: khoa Date: Wed, 21 Feb 2024 23:50:27 +0900 Subject: [PATCH 1/4] Fixed typo and ignored outputs --- .gitignore | 4 ++++ README.md | 2 +- cifar100_resnet18_k200.sh | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 cifar100_resnet18_k200.sh diff --git a/.gitignore b/.gitignore index f3b16c0..d6c088d 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,7 @@ poetry.toml pyrightconfig.json # End of https://www.toptal.com/developers/gitignore/api/python + + + +outputs/ diff --git a/README.md b/README.md index ee01c1c..18789b2 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ git clone https://github.com/NUS-HPC-AI-Lab/Neural-Network-Diffusion.git 2. Create a new Conda environment and activate it: ``` -conda env create -f environment.yaml +conda env create -f environment.yml conda activate pdiff ``` diff --git a/cifar100_resnet18_k200.sh b/cifar100_resnet18_k200.sh old mode 100644 new mode 100755 index 0161d82..77da46d --- a/cifar100_resnet18_k200.sh +++ b/cifar100_resnet18_k200.sh @@ -1,2 +1,2 @@ -python task_training # get the model data for training p-diff -python train_p_diff --task cifar100 --system ae_ddpm \ No newline at end of file +python task_training.py # get the model data for training p-diff +python train_p_diff.py --task cifar100 --system ae_ddpm \ No newline at end of file From 8fbe72d5057e9f22eb1c8a5eedf39ac879fd7573 Mon Sep 17 00:00:00 2001 From: khoa Date: Wed, 21 Feb 2024 23:55:55 +0900 Subject: [PATCH 2/4] Fixed code to run task_training.py --- configs/base.yaml | 2 +- core/system/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/base.yaml b/configs/base.yaml index a4be944..12853da 100644 --- a/configs/base.yaml +++ b/configs/base.yaml @@ -5,7 +5,7 @@ defaults: device: cuda_visible_devices: "0,1,2,3,4,5,6" - id: 1 + id: 0 cuda: cuda:${device.id} load_system_checkpoint: diff --git a/core/system/__init__.py b/core/system/__init__.py index b768892..c2473b5 100644 --- a/core/system/__init__.py +++ b/core/system/__init__.py @@ -3,12 +3,12 @@ from .encoder import * from .vae import VAESystem from .ae_ddpm import AE_DDPM -from .explore import Explore +# from .explore import Explore systems = { 'encoder': EncoderSystem, 'ddpm': DDPM, 'vae': VAESystem, 'ae_ddpm': AE_DDPM, - 'explore': Explore, + # 'explore': Explore, } \ No newline at end of file From 4586020dbd5bbf2275825bd3df720dcf77311237 Mon Sep 17 00:00:00 2001 From: khoa Date: Wed, 21 Feb 2024 23:56:04 +0900 Subject: [PATCH 3/4] ignored data --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d6c088d..a8d4140 100644 --- a/.gitignore +++ b/.gitignore @@ -228,3 +228,4 @@ pyrightconfig.json outputs/ +data/ From 84f4d09c0707c7721a7cd68f6e27bbc9bc8794c6 Mon Sep 17 00:00:00 2001 From: khoa Date: Thu, 22 Feb 2024 10:49:31 +0900 Subject: [PATCH 4/4] fixed to run train_p_diff --- .gitignore | 1 + cifar100_resnet18_k200.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a8d4140..cf3db71 100644 --- a/.gitignore +++ b/.gitignore @@ -229,3 +229,4 @@ pyrightconfig.json outputs/ data/ +param_data/ diff --git a/cifar100_resnet18_k200.sh b/cifar100_resnet18_k200.sh index 77da46d..837545b 100755 --- a/cifar100_resnet18_k200.sh +++ b/cifar100_resnet18_k200.sh @@ -1,2 +1,2 @@ python task_training.py # get the model data for training p-diff -python train_p_diff.py --task cifar100 --system ae_ddpm \ No newline at end of file +python train_p_diff.py task=cifar100 system=ae_ddpm \ No newline at end of file