From 69590f423d5d4318af4938cad1c23e11b86f93fe Mon Sep 17 00:00:00 2001
From: Carl De Sousa Trias <carl.de-sousa-trias@telecom-sudparis.eu>
Date: Mon, 6 May 2024 08:53:00 +0000
Subject: [PATCH] Some updates for Reference Software 1.2

---
 NNW/ADI.py                                          |   4 ++--
 .../adi}/ILSVRC2017_test_00000189.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00000232.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00000522.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00000764.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00000851.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00001586.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00001758.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00001788.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00001819.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00001837.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00002064.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00002355.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00002380.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00002635.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00003168.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00003252.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00003363.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00003967.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00004092.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00004283.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00004885.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00004903.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00004929.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00005107.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00005403.JPEG              | Bin
 .../adi}/ILSVRC2017_test_00005489.JPEG              | Bin
 .../vgg16_Uchi_watermarking_dict.npy                | Bin
 vgg16_Uchi_weights => Resources/vgg16_Uchi_weights  | Bin
 Robustness.py                                       |   4 ++--
 30 files changed, 4 insertions(+), 4 deletions(-)
 rename {adi => Resources/adi}/ILSVRC2017_test_00000189.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00000232.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00000522.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00000764.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00000851.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00001586.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00001758.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00001788.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00001819.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00001837.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00002064.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00002355.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00002380.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00002635.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00003168.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00003252.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00003363.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00003967.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00004092.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00004283.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00004885.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00004903.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00004929.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00005107.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00005403.JPEG (100%)
 rename {adi => Resources/adi}/ILSVRC2017_test_00005489.JPEG (100%)
 rename vgg16_Uchi_watermarking_dict.npy => Resources/vgg16_Uchi_watermarking_dict.npy (100%)
 rename vgg16_Uchi_weights => Resources/vgg16_Uchi_weights (100%)

diff --git a/NNW/ADI.py b/NNW/ADI.py
index bc61544..9ebc50c 100644
--- a/NNW/ADI.py
+++ b/NNW/ADI.py
@@ -117,8 +117,8 @@ class Adi_tools():
 
 '''
 tools = Adi_tools()
-folder = 'adi/'
+folder = 'Resources/adi/'
 power = 10
 watermarking_dict = {'folder': folder, 'power': power, 'dataset': trainset, 'num_class': 10,
                      'batch_size':batch_size,'transform': inference_transform, "types":1}
-'''
\ No newline at end of file
+'''
diff --git a/adi/ILSVRC2017_test_00000189.JPEG b/Resources/adi/ILSVRC2017_test_00000189.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00000189.JPEG
rename to Resources/adi/ILSVRC2017_test_00000189.JPEG
diff --git a/adi/ILSVRC2017_test_00000232.JPEG b/Resources/adi/ILSVRC2017_test_00000232.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00000232.JPEG
rename to Resources/adi/ILSVRC2017_test_00000232.JPEG
diff --git a/adi/ILSVRC2017_test_00000522.JPEG b/Resources/adi/ILSVRC2017_test_00000522.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00000522.JPEG
rename to Resources/adi/ILSVRC2017_test_00000522.JPEG
diff --git a/adi/ILSVRC2017_test_00000764.JPEG b/Resources/adi/ILSVRC2017_test_00000764.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00000764.JPEG
rename to Resources/adi/ILSVRC2017_test_00000764.JPEG
diff --git a/adi/ILSVRC2017_test_00000851.JPEG b/Resources/adi/ILSVRC2017_test_00000851.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00000851.JPEG
rename to Resources/adi/ILSVRC2017_test_00000851.JPEG
diff --git a/adi/ILSVRC2017_test_00001586.JPEG b/Resources/adi/ILSVRC2017_test_00001586.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00001586.JPEG
rename to Resources/adi/ILSVRC2017_test_00001586.JPEG
diff --git a/adi/ILSVRC2017_test_00001758.JPEG b/Resources/adi/ILSVRC2017_test_00001758.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00001758.JPEG
rename to Resources/adi/ILSVRC2017_test_00001758.JPEG
diff --git a/adi/ILSVRC2017_test_00001788.JPEG b/Resources/adi/ILSVRC2017_test_00001788.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00001788.JPEG
rename to Resources/adi/ILSVRC2017_test_00001788.JPEG
diff --git a/adi/ILSVRC2017_test_00001819.JPEG b/Resources/adi/ILSVRC2017_test_00001819.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00001819.JPEG
rename to Resources/adi/ILSVRC2017_test_00001819.JPEG
diff --git a/adi/ILSVRC2017_test_00001837.JPEG b/Resources/adi/ILSVRC2017_test_00001837.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00001837.JPEG
rename to Resources/adi/ILSVRC2017_test_00001837.JPEG
diff --git a/adi/ILSVRC2017_test_00002064.JPEG b/Resources/adi/ILSVRC2017_test_00002064.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00002064.JPEG
rename to Resources/adi/ILSVRC2017_test_00002064.JPEG
diff --git a/adi/ILSVRC2017_test_00002355.JPEG b/Resources/adi/ILSVRC2017_test_00002355.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00002355.JPEG
rename to Resources/adi/ILSVRC2017_test_00002355.JPEG
diff --git a/adi/ILSVRC2017_test_00002380.JPEG b/Resources/adi/ILSVRC2017_test_00002380.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00002380.JPEG
rename to Resources/adi/ILSVRC2017_test_00002380.JPEG
diff --git a/adi/ILSVRC2017_test_00002635.JPEG b/Resources/adi/ILSVRC2017_test_00002635.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00002635.JPEG
rename to Resources/adi/ILSVRC2017_test_00002635.JPEG
diff --git a/adi/ILSVRC2017_test_00003168.JPEG b/Resources/adi/ILSVRC2017_test_00003168.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00003168.JPEG
rename to Resources/adi/ILSVRC2017_test_00003168.JPEG
diff --git a/adi/ILSVRC2017_test_00003252.JPEG b/Resources/adi/ILSVRC2017_test_00003252.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00003252.JPEG
rename to Resources/adi/ILSVRC2017_test_00003252.JPEG
diff --git a/adi/ILSVRC2017_test_00003363.JPEG b/Resources/adi/ILSVRC2017_test_00003363.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00003363.JPEG
rename to Resources/adi/ILSVRC2017_test_00003363.JPEG
diff --git a/adi/ILSVRC2017_test_00003967.JPEG b/Resources/adi/ILSVRC2017_test_00003967.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00003967.JPEG
rename to Resources/adi/ILSVRC2017_test_00003967.JPEG
diff --git a/adi/ILSVRC2017_test_00004092.JPEG b/Resources/adi/ILSVRC2017_test_00004092.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00004092.JPEG
rename to Resources/adi/ILSVRC2017_test_00004092.JPEG
diff --git a/adi/ILSVRC2017_test_00004283.JPEG b/Resources/adi/ILSVRC2017_test_00004283.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00004283.JPEG
rename to Resources/adi/ILSVRC2017_test_00004283.JPEG
diff --git a/adi/ILSVRC2017_test_00004885.JPEG b/Resources/adi/ILSVRC2017_test_00004885.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00004885.JPEG
rename to Resources/adi/ILSVRC2017_test_00004885.JPEG
diff --git a/adi/ILSVRC2017_test_00004903.JPEG b/Resources/adi/ILSVRC2017_test_00004903.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00004903.JPEG
rename to Resources/adi/ILSVRC2017_test_00004903.JPEG
diff --git a/adi/ILSVRC2017_test_00004929.JPEG b/Resources/adi/ILSVRC2017_test_00004929.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00004929.JPEG
rename to Resources/adi/ILSVRC2017_test_00004929.JPEG
diff --git a/adi/ILSVRC2017_test_00005107.JPEG b/Resources/adi/ILSVRC2017_test_00005107.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00005107.JPEG
rename to Resources/adi/ILSVRC2017_test_00005107.JPEG
diff --git a/adi/ILSVRC2017_test_00005403.JPEG b/Resources/adi/ILSVRC2017_test_00005403.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00005403.JPEG
rename to Resources/adi/ILSVRC2017_test_00005403.JPEG
diff --git a/adi/ILSVRC2017_test_00005489.JPEG b/Resources/adi/ILSVRC2017_test_00005489.JPEG
similarity index 100%
rename from adi/ILSVRC2017_test_00005489.JPEG
rename to Resources/adi/ILSVRC2017_test_00005489.JPEG
diff --git a/vgg16_Uchi_watermarking_dict.npy b/Resources/vgg16_Uchi_watermarking_dict.npy
similarity index 100%
rename from vgg16_Uchi_watermarking_dict.npy
rename to Resources/vgg16_Uchi_watermarking_dict.npy
diff --git a/vgg16_Uchi_weights b/Resources/vgg16_Uchi_weights
similarity index 100%
rename from vgg16_Uchi_weights
rename to Resources/vgg16_Uchi_weights
diff --git a/Robustness.py b/Robustness.py
index 673d4e0..864ccf5 100644
--- a/Robustness.py
+++ b/Robustness.py
@@ -44,8 +44,8 @@ if __name__ == '__main__':
     model.classifier = nn.Linear(25088, 10)
     model.to(device)
     # watermarking section (change here to test another method) #######################################
-    tools = Adi_tools()
-    reload = 'vgg16_Adi'
+    tools = Uchi_tools()
+    reload = 'Resources/vgg16_Uchi'
     watermarking_dict = np.load(reload+'_watermarking_dict.npy', allow_pickle=True).item()
     # watermarking section (END change here to test another method) ###################################
     name = '_quantization'
-- 
GitLab