oodeel 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

oodeel-0.3.0.dist-info/RECORD

@@ -0,0 +1,57 @@
+oodeel/__init__.py,sha256=-3tTNyrjeIvLCDPR0kCXup2TQX0KHn7R0emJDOKUYxI,1343
+oodeel/datasets/__init__.py,sha256=COhGN25e3TsYtIz5rJgc0aNr_k3JjGXE3cCYd5RajTQ,1398
+oodeel/datasets/data_handler.py,sha256=mWg1_Jv19rpz7p8o2DOE859J8evTRrWTiW5U_prw1sQ,10532
+oodeel/datasets/tf_data_handler.py,sha256=H3BN_N9fzT19vtJtjhe0XJG4aA-7BauGrEY4OASxc90,23102
+oodeel/datasets/torch_data_handler.py,sha256=jzQ1DvHC3xM0DOLHWGtV5OX-C63eqhabDyVDKmg11cc,24792
+oodeel/datasets/deprecated/DEPRECATED_data_handler.py,sha256=fGK3_YSbNdHuljBtrjt7xbi6ESfNpnQV_pUSn9Uot2k,7910
+oodeel/datasets/deprecated/DEPRECATED_ooddataset.py,sha256=Ad2otHV_vClK7ZY2D3-gW4QO_B3ir6DzJM1kYeNCJpw,13294
+oodeel/datasets/deprecated/DEPRECATED_tf_data_handler.py,sha256=heK9c1g829LZof8CkAmmxpTvE0EpoLZOLXuYKMrL8b4,24811
+oodeel/datasets/deprecated/DEPRECATED_torch_data_handler.py,sha256=eWCOlSPbblS8KZZAlu-M10QgY2Hv7mOq1uawLcGs0FE,26986
+oodeel/datasets/deprecated/__init__.py,sha256=VYVsYZ-_TgGyd5ls5rudytQGPocm9I7N5_M9rHcV91w,1506
+oodeel/eval/__init__.py,sha256=lQIUQjczeiRtfIqH2uLNJGubKUN6vPM93mTfY1Qz3bc,1297
+oodeel/eval/metrics.py,sha256=9fg7fVTT10_XIKrcsan6HQOlhUdFJhZ3f5VAprTKsjM,8839
+oodeel/eval/plots/__init__.py,sha256=YmcFh8RUGvljc-vCew6EiIFMDn0YA_UOfDj4eAv5_Yk,1487
+oodeel/eval/plots/features.py,sha256=fP4soXDg3BAtkBySvfUIH3Z_E3ofuU3QenH6SHRnzlM,11821
+oodeel/eval/plots/metrics.py,sha256=3QvLqEB1pAggNHeQJzUpLqL_Ro0MOJ_bPrLcLmf_qpk,4189
+oodeel/eval/plots/plotly.py,sha256=XHPFuXARrRIGVrRB7d0Od36iCn3JBP387tDrwRvPhU0,6040
+oodeel/extractor/__init__.py,sha256=Ew8gLh-xanZsWJe_gKvTa_7HciZ5yTZ-cADKuj7-PCg,1538
+oodeel/extractor/feature_extractor.py,sha256=WFNOrZjmCPt2mPr3G4ctcSqiSuvFjMZkozrwazv1zwg,6789
+oodeel/extractor/keras_feature_extractor.py,sha256=bjJfh_wgt2Y0NOGBesZ8uBjtcyiXtHYJzsWCS_tsIFg,12412
+oodeel/extractor/torch_feature_extractor.py,sha256=D_c_AV29Ciu-d_bWXk1ABad66qdX8wdddxrCgLQ-5G4,15779
+oodeel/methods/__init__.py,sha256=BkpwY0-N6SAvJ8iUxe1g0J8On-tbmLCCYTJIFI3M7i0,1721
+oodeel/methods/base.py,sha256=zeizvn6pMvdaP4FnI5TcvgrCdFARmxrwCfyU3D9LS1U,14831
+oodeel/methods/dknn.py,sha256=6eyoHAKzb3s3pkukr6r5v9_UyK8_Rj269iHQxv1PoFI,4982
+oodeel/methods/energy.py,sha256=u3TSoGDll1myCiA0FkuYZZNmGEXTTFPRSpT7-J8Q6Ec,4505
+oodeel/methods/entropy.py,sha256=dcG7oC6velSN1sky9DJAD9eD32EEPqgM4R45_iU-R18,4172
+oodeel/methods/gen.py,sha256=JafCnih09929I2KgOVaDfn8T1O4mbKdZgz3lByKvOJQ,4505
+oodeel/methods/gram.py,sha256=35yH3BYl5CgsC2fzw4GLY21MWfyLNvY0mp3tAfmJkJ4,12220
+oodeel/methods/mahalanobis.py,sha256=C6t2Gj7Ckp5KIhGFiOpk9uWY1RWIkM6h_qfLQkVGETc,7393
+oodeel/methods/mls.py,sha256=FxN1XYlTkOR2uZs07krsD8qCAfJr9UIpdKH6FYEn37Q,4399
+oodeel/methods/odin.py,sha256=Ty1YItWIsvplad72JmGuNZ_MDIBxg9iJVbjAcn33K3U,5548
+oodeel/methods/rmds.py,sha256=ji6r8_AGhIc_75-u174Mj6a8YpHC6EHDm4mFBSOsiFM,4970
+oodeel/methods/she.py,sha256=qJftwTM1UD_dtBvGH66RtejWqpkxR69ttpBy5KbNvHQ,7254
+oodeel/methods/vim.py,sha256=PMy04hMZ08THlbi66ZWg15JL9NNGBG6vndz40sez5Ps,9475
+oodeel/preprocess/__init__.py,sha256=65M9hKYHYzZ6lACA6xo7ODKofaAoqfFZ4aC5ZSJeN2I,1484
+oodeel/preprocess/tf_preprocess.py,sha256=TRaEA7KrVjWFB81vlnNk9hN-G0tGhDa97VvrBEaP9vM,4048
+oodeel/preprocess/torch_preprocess.py,sha256=BTjOyEHPfqx_CSv6Lw3zBi2wKEjAIdPN1DuBptcebA0,3976
+oodeel/types/__init__.py,sha256=9TTXjSBfbaDIVMRnclInHI-CBr4L6VZTi61rCJKcTw8,2484
+oodeel/utils/__init__.py,sha256=Lue9BysqeJf5Ej0szafgC9na8IZZR7hWGInJxoEiHUg,1696
+oodeel/utils/general_utils.py,sha256=xc6e7q19ALgMxdCgS7TIyDiMUIGF4ih-aTK1kSlqWoQ,3292
+oodeel/utils/operator.py,sha256=ETAFJ_oYhiD1Rawjooueq5KDl4SNzJR5fQDUU05uMz8,8262
+oodeel/utils/tf_operator.py,sha256=gHJZlD6SKOBxDtwv0oy6u93oXYiS5gylKv5lbVWlzx4,9385
+oodeel/utils/tf_training_tools.py,sha256=31cPCpXKmO7lMRrefmY93m6cSn0DRaHxVFeYgUiE6kI,8090
+oodeel/utils/torch_operator.py,sha256=lO_Onb4km6UNyqYjRkFPi3OcoT2MUwE1ktzP_JMDmFY,10199
+oodeel/utils/torch_training_tools.py,sha256=ggL_iDwyquTw9CtQAg--IODVdS1BFsBw4U5IOVlAsK8,11192
+oodeel-0.3.0.dist-info/licenses/LICENSE,sha256=XrlZ0uYNVeUAF-iEVX21J3CTJjYPgIZUagYSy3Hf0jk,1265
+tests/__init__.py,sha256=lQIUQjczeiRtfIqH2uLNJGubKUN6vPM93mTfY1Qz3bc,1297
+tests/tools_operator.py,sha256=YTU_FppXZPUyi3nldQsDkCMQ3Bvz1Hn_V7L45EEwftc,5328
+tests/tests_tensorflow/__init__.py,sha256=VuiDSdOBB2jUeobzAW-XTtHJQrcyZpp8i2DyFu0A2RI,1710
+tests/tests_tensorflow/tf_methods_utils.py,sha256=wHjsvKJj1EhcmAQhDgSWfRbVZR_jJwknT8vyez0YByw,5277
+tests/tests_tensorflow/tools_tf.py,sha256=Z_MEzhwCOF7E7uT-tnfRS3Po9hg0MFzbESP7sMAFBkY,3499
+tests/tests_torch/__init__.py,sha256=3mVxix2Ecn2wUo9DxvzyJBmyOAkv4fVWHHp6uLQHoic,1738
+tests/tests_torch/tools_torch.py,sha256=lS5_kctnyiB6eP-NTfVUsbj5Mn-AiRO0Jo75p8djmwg,4975
+tests/tests_torch/torch_methods_utils.py,sha256=PAxBs2smjsDtQjgwrwdbDzvVrboczc0pQOKtNfl82J4,5432
+oodeel-0.3.0.dist-info/METADATA,sha256=YNvMUC4osqrw2FWlqqNMJiapvjBGFwxp834EOkNIYtg,20299
+oodeel-0.3.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+oodeel-0.3.0.dist-info/top_level.txt,sha256=zkYRty1FGJ1dkpk-5MU_4uFfBFmcxXoqSwej73xELDs,13
+oodeel-0.3.0.dist-info/RECORD,,

{oodeel-0.2.0.dist-info → oodeel-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/tests_tensorflow/tf_methods_utils.py

@@ -66,7 +66,8 @@ def load_blobs_data(batch_size=128, num_samples=10000, train_ratio=0.8):
 def load_blob_mlp():
     model_path_blobs = tf.keras.utils.get_file(
         "blobs_mlp.h5",
-        origin="https://share.deel.ai/s/bc5jx9HQAGYya9m/download/blobs_mlp.h5",
+        origin="https://github.com/deel-ai/oodeel/blob/assets/test_models/"
+        + "blobs_mlp.h5?raw=True",
         cache_dir=model_path,
         cache_subdir="",
     )

tests/tests_torch/torch_methods_utils.py

@@ -23,12 +23,11 @@
 import os
 
 import numpy as np
-import requests
 import torch
 from sklearn.datasets import make_blobs
 from sklearn.model_selection import train_test_split
 
-from oodeel.datasets import OODDataset
+from oodeel.datasets import load_data_handler
 from oodeel.eval.metrics import bench_metrics
 
 device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
@@ -53,31 +52,26 @@ def load_blobs_data(batch_size=128, num_samples=10000, train_ratio=0.8):
     )
 
     # === id / ood split ===
-    blobs_train = OODDataset((X_train, y_train), backend="torch")
-    blobs_test = OODDataset((X_test, y_test), backend="torch")
-    oods_fit, _ = blobs_train.split_by_class(in_labels, out_labels)
-    oods_in, oods_out = blobs_test.split_by_class(in_labels, out_labels)
+    handler = load_data_handler("torch")
+    blobs_train = handler.load_dataset((X_train, y_train))
+    blobs_test = handler.load_dataset((X_test, y_test))
+    oods_fit, _ = handler.split_by_class(blobs_train, in_labels, out_labels)
+    oods_in, oods_out = handler.split_by_class(blobs_test, in_labels, out_labels)
 
     # === prepare data (shuffle, batch) => torch dataloaders ===
-    ds_fit = oods_fit.prepare(batch_size=batch_size, shuffle=True)
-    ds_in = oods_in.prepare(batch_size=batch_size)
-    ds_out = oods_out.prepare(batch_size=batch_size)
+    ds_fit = handler.prepare(oods_fit, batch_size=batch_size, shuffle=True)
+    ds_in = handler.prepare(oods_in, batch_size=batch_size)
+    ds_out = handler.prepare(oods_out, batch_size=batch_size)
     return ds_fit, ds_in, ds_out
 
 
 def load_blob_mlp():
-    model_path_blob = os.path.join(model_path, "blobs_mlp.pt")
-
-    # if model not in local, download it
-    if not os.path.exists(model_path_blob):
-        data = requests.get(
-            "https://share.deel.ai/s/xcyk3ET8fzfTp8S/download/blobs_mlp.pt"
-        )
-        with open(model_path_blob, "wb") as file:
-            file.write(data.content)
-
     # load model
-    model = torch.load(model_path_blob, map_location=device)
+    model = torch.hub.load_state_dict_from_url(
+        "https://github.com/deel-ai/oodeel/blob/assets/"
+        + "test_models/blobs_mlp.pt?raw=True",
+        map_location=device,
+    )
     model.eval()
     return model
 
@@ -125,14 +119,27 @@ def eval_detector_on_blobs(
 
     # react specific test
     # /!\ do it at the end of the test because it may affect the detector's behaviour
+
     if check_react_clipping:
         assert detector.react_threshold is not None
+
         penult_feat_extractor = detector._load_feature_extractor(
-            model=model, feature_layers_id=[-2, -1]
-        )
-        penult_features = penult_feat_extractor.predict(ds_fit)[0][0]
-        assert torch.max(penult_features) <= detector.react_threshold, (
-            f"Maximum value of penultimate features ({torch.max(penult_features)})"
-            + " should be less than or equal to the react threshold value"
-            + f" ({detector.react_threshold})"
+            model=model, feature_layers_id=[-1]
         )
+        # penult_feat_extractor._prepare_ood_handles()
+
+        def hook(_, input):
+            penult_feat_extractor._features["test"] = input[0]
+
+        penult_feat_extractor.model[-1].register_forward_pre_hook(hook)
+        for x, y in ds_fit:
+            _ = penult_feat_extractor.predict_tensor(x)
+            assert (
+                torch.max(penult_feat_extractor._features["test"])
+                <= detector.react_threshold
+            ), (
+                "Maximum value of penultimate features"
+                + f" ({torch.max(penult_feat_extractor._features)})"
+                + " should be less than or equal to the react threshold value"
+                + f" ({detector.react_threshold})"
+            )

oodeel-0.2.0.dist-info/RECORD

@@ -1,47 +0,0 @@
-oodeel/__init__.py,sha256=l0YOqo4m6cWM79XL7zKA9yVCeKix58qm5I_v4dvzlNE,1343
-oodeel/datasets/__init__.py,sha256=BdpBDtWoGS3fgJCRU6TTCcYodzVGYANv5q4Abqhp1RU,1332
-oodeel/datasets/data_handler.py,sha256=kxWKmUjdKKtOOWIPXbt96Bhg8SxVcFUhBCD2XEHx5Ac,7904
-oodeel/datasets/ooddataset.py,sha256=tq3ZIjLNe3iWhjFkmpI4jomLJJ4-CfmsuHoTFR25gBY,13360
-oodeel/datasets/tf_data_handler.py,sha256=FmqWoV05yIQ0lHNBdDE8pTgSdma4jbdjT3YvQOS9KnY,24794
-oodeel/datasets/torch_data_handler.py,sha256=SMa8RvMYp2-f0AI3m5MKeZVFh9G6CMVJl_MNZmiLK74,26814
-oodeel/eval/__init__.py,sha256=lQIUQjczeiRtfIqH2uLNJGubKUN6vPM93mTfY1Qz3bc,1297
-oodeel/eval/metrics.py,sha256=ywU9Y4E_PYckdxllAzUd17T1NtCKq4SfRPigrw78PHI,8589
-oodeel/eval/plots/__init__.py,sha256=YmcFh8RUGvljc-vCew6EiIFMDn0YA_UOfDj4eAv5_Yk,1487
-oodeel/eval/plots/features.py,sha256=fP4soXDg3BAtkBySvfUIH3Z_E3ofuU3QenH6SHRnzlM,11821
-oodeel/eval/plots/metrics.py,sha256=3QvLqEB1pAggNHeQJzUpLqL_Ro0MOJ_bPrLcLmf_qpk,4189
-oodeel/eval/plots/plotly.py,sha256=XHPFuXARrRIGVrRB7d0Od36iCn3JBP387tDrwRvPhU0,6040
-oodeel/extractor/__init__.py,sha256=Ew8gLh-xanZsWJe_gKvTa_7HciZ5yTZ-cADKuj7-PCg,1538
-oodeel/extractor/feature_extractor.py,sha256=a9qEBzbMpGfWPPHxx74QY5L3BqQAwfbWiGg136rCwRc,6210
-oodeel/extractor/keras_feature_extractor.py,sha256=zqlsfaD2g7d-pneRWCsqPXZIOi9RiD12P5hWegkIKR8,10132
-oodeel/extractor/torch_feature_extractor.py,sha256=MXB5FU6R7K4rwaA_PO5TBfqsoN1DO9Ku1mo-wjqsCmM,12864
-oodeel/methods/__init__.py,sha256=1CXE3t5LUswDHfoPNzlpx5DY-5jbGpj_ZEjNutPzeCk,1587
-oodeel/methods/base.py,sha256=t66Wcan57s7QAYbJDi5ufycATJYhLXqXAuv7fmZ_W0A,12053
-oodeel/methods/dknn.py,sha256=moZTcUu7T_1c5K_jUlKkFGfsXtKvZfejAfVCM54Nsdc,4270
-oodeel/methods/energy.py,sha256=xcSVs0PibzjFT6pftMuKyZlYkmMdqWJA2WQxw60NHHM,4211
-oodeel/methods/entropy.py,sha256=F5w312f6wpvk9DBHi7LDDcndrMOoPY8OuFCO0ddgOU4,3878
-oodeel/methods/gram.py,sha256=5vS-kIGTlpzxnlYJCCf8Q1QbD0wPOE95x64c24SmUYw,11764
-oodeel/methods/mahalanobis.py,sha256=yXcsCF3UyFRbnDwyOuDjCOgPR5wc9HVSGTiFP5c8_fM,7230
-oodeel/methods/mls.py,sha256=BJajmhl3x11Kr-8RwYq59kAn-rveA5ydyoko7ajF_60,4105
-oodeel/methods/odin.py,sha256=E4I2olYH9xvnkgau_2rcPnWL3FFWAh-jxG60-CGxlJA,5254
-oodeel/methods/vim.py,sha256=-GvNIp0qRP3qb8YeVhnlFMDh9l00WZHfNbbgdWNo_1E,9475
-oodeel/types/__init__.py,sha256=9TTXjSBfbaDIVMRnclInHI-CBr4L6VZTi61rCJKcTw8,2484
-oodeel/utils/__init__.py,sha256=Lue9BysqeJf5Ej0szafgC9na8IZZR7hWGInJxoEiHUg,1696
-oodeel/utils/general_utils.py,sha256=xc6e7q19ALgMxdCgS7TIyDiMUIGF4ih-aTK1kSlqWoQ,3292
-oodeel/utils/operator.py,sha256=fd9gtKLwGXZcSb8t0XGtaTwgnwUYYy7Ea-2T5ckXUDM,7750
-oodeel/utils/tf_operator.py,sha256=6wgbTS-HpBq2yH2aW5BxsySDHz9Zo7u0TV4xhqD-3w8,8894
-oodeel/utils/tf_training_tools.py,sha256=NhRi3gGlbwIbA1jfLOb8gF6t1QQFqZC-afhJ4YNDcpw,8076
-oodeel/utils/torch_operator.py,sha256=8VVL3d3Ezuz-XSCt44j2rfyN4yMyRyI6Z6M2cT70Z9c,9639
-oodeel/utils/torch_training_tools.py,sha256=ggL_iDwyquTw9CtQAg--IODVdS1BFsBw4U5IOVlAsK8,11192
-tests/__init__.py,sha256=lQIUQjczeiRtfIqH2uLNJGubKUN6vPM93mTfY1Qz3bc,1297
-tests/tools_operator.py,sha256=YTU_FppXZPUyi3nldQsDkCMQ3Bvz1Hn_V7L45EEwftc,5328
-tests/tests_tensorflow/__init__.py,sha256=VuiDSdOBB2jUeobzAW-XTtHJQrcyZpp8i2DyFu0A2RI,1710
-tests/tests_tensorflow/tf_methods_utils.py,sha256=JJqreJaHvhDaGEgw1w7wUhy8YZqYBgkleNC__lYg2Xs,5246
-tests/tests_tensorflow/tools_tf.py,sha256=Z_MEzhwCOF7E7uT-tnfRS3Po9hg0MFzbESP7sMAFBkY,3499
-tests/tests_torch/__init__.py,sha256=3mVxix2Ecn2wUo9DxvzyJBmyOAkv4fVWHHp6uLQHoic,1738
-tests/tests_torch/tools_torch.py,sha256=lS5_kctnyiB6eP-NTfVUsbj5Mn-AiRO0Jo75p8djmwg,4975
-tests/tests_torch/torch_methods_utils.py,sha256=60dkvArDX3mq9gSato2ghp9BCZeXZ_U64WosCjgdGbE,5234
-oodeel-0.2.0.dist-info/LICENSE,sha256=XrlZ0uYNVeUAF-iEVX21J3CTJjYPgIZUagYSy3Hf0jk,1265
-oodeel-0.2.0.dist-info/METADATA,sha256=hdHgigvg-WFpDi0cC7CcKKYPhr0I7xIHWcfelgpL7h4,17604
-oodeel-0.2.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-oodeel-0.2.0.dist-info/top_level.txt,sha256=zkYRty1FGJ1dkpk-5MU_4uFfBFmcxXoqSwej73xELDs,13
-oodeel-0.2.0.dist-info/RECORD,,