Merge pull request #11 from pralab/secml2rename

Changing name of the package from src to secml2

.gitignore

@@ -244,6 +244,4 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
-
-models/
+*.lnk

src/adv/evasion/base_evasion_attack.py → secml2/adv/evasion/base_evasion_attack.py

@@ -3,9 +3,9 @@
 
 from torch.utils.data import DataLoader
 
-from src.adv.backends import Backends
-from src.adv.evasion.perturbation_models import PerturbationModels
-from src.models.base_model import BaseModel
+from secml2.adv.backends import Backends
+from secml2.adv.evasion.perturbation_models import PerturbationModels
+from secml2.models.base_model import BaseModel
 
 
 class BaseEvasionAttackCreator:

src/adv/evasion/composite_attack.py → secml2/adv/evasion/composite_attack.py

@@ -2,15 +2,15 @@
 
 import torch.nn
 from torch.nn import CrossEntropyLoss
-from torch.optim import Adam, SGD
+from torch.optim import Adam, SGD, Optimizer
 from torch.utils.data import DataLoader, TensorDataset
 
-from src.adv.evasion.base_evasion_attack import BaseEvasionAttack
-from src.manipulations.manipulation import Manipulation
-from src.models.base_model import BaseModel
-from src.optimization.constraints import Constraint
-from src.optimization.gradient_processing import GradientProcessing
-from src.optimization.initializer import Initializer
+from secml2.adv.evasion.base_evasion_attack import BaseEvasionAttack
+from secml2.manipulations.manipulation import Manipulation
+from secml2.models.base_model import BaseModel
+from secml2.optimization.constraints import Constraint
+from secml2.optimization.gradient_processing import GradientProcessing
+from secml2.optimization.initializer import Initializer
 
 CE_LOSS = "ce_loss"
 LOGITS_LOSS = "logits_loss"
@@ -32,7 +32,7 @@ def __init__(
         num_steps: int,
         step_size: float,
         loss_function: Union[str, torch.nn.Module],
-        optimizer_cls: Union[str, Type[torch.nn.Module]],
+        optimizer_cls: Union[str, Type[Optimizer]],
         manipulation_function: Manipulation,
         domain_constraints: List[Constraint],
         perturbation_constraints: List[Type[Constraint]],

src/adv/evasion/foolbox.py → secml2/adv/evasion/foolbox.py

@@ -1,10 +1,10 @@
 from typing import Optional
-from src.adv.evasion.base_evasion_attack import BaseEvasionAttack
+from secml2.adv.evasion.base_evasion_attack import BaseEvasionAttack
 from foolbox.attacks.base import Attack
 from torch.utils.data import DataLoader
-from src.models.base_model import BaseModel
-from src.models.pytorch.base_pytorch_nn import BasePytorchClassifier
-from src.models.base_model import BaseModel
+from secml2.models.base_model import BaseModel
+from secml2.models.pytorch.base_pytorch_nn import BasePytorchClassifier
+from secml2.models.base_model import BaseModel
 from foolbox.models.pytorch import PyTorchModel
 from foolbox.criteria import Misclassification, TargetedMisclassification
 import torch

src/adv/evasion/pgd.py → secml2/adv/evasion/pgd.py

@@ -3,15 +3,15 @@
 import torch
 from torch.optim import Adam
 
-from src.adv.evasion.composite_attack import CompositeEvasionAttack, CE_LOSS, SGD
-from src.manipulations.manipulation import AdditiveManipulation
-from src.optimization.initializer import Initializer
-from src.optimization.gradient_processing import LinearProjectionGradientProcessing
-from src.adv.evasion.foolbox import BaseFoolboxEvasionAttack
-
-from src.adv.evasion.perturbation_models import PerturbationModels
-from src.adv.backends import Backends
-from src.adv.evasion.base_evasion_attack import (
+from secml2.adv.evasion.composite_attack import CompositeEvasionAttack, CE_LOSS, SGD
+from secml2.manipulations.manipulation import AdditiveManipulation
+from secml2.optimization.initializer import Initializer
+from secml2.optimization.gradient_processing import LinearProjectionGradientProcessing
+from secml2.adv.evasion.foolbox import BaseFoolboxEvasionAttack
+
+from secml2.adv.evasion.perturbation_models import PerturbationModels
+from secml2.adv.backends import Backends
+from secml2.adv.evasion.base_evasion_attack import (
     BaseEvasionAttackCreator,
 )
 
@@ -21,7 +21,7 @@
     LinfProjectedGradientDescentAttack,
 )
 
-from src.optimization.constraints import (
+from secml2.optimization.constraints import (
     ClipConstraint,
     L1Constraint,
     L2Constraint,

src/examples/mnist_example.py → secml2/examples/mnist_example.py

@@ -2,12 +2,12 @@
 import torch
 import torchvision.datasets
 from torch.utils.data import DataLoader, Subset
-from src.adv.backends import Backends
-from src.adv.evasion.pgd import PGD
-from src.adv.evasion.perturbation_models import PerturbationModels
+from secml2.adv.backends import Backends
+from secml2.adv.evasion.pgd import PGD
+from secml2.adv.evasion.perturbation_models import PerturbationModels
 
-from src.metrics.classification import Accuracy
-from src.models.pytorch.base_pytorch_nn import BasePytorchClassifier
+from secml2.metrics.classification import Accuracy
+from secml2.models.pytorch.base_pytorch_nn import BasePytorchClassifier
 
 from torch import nn
 

src/examples/run_evasion_attack.py → secml2/examples/run_evasion_attack.py

@@ -1,12 +1,12 @@
 import torch
 import torchvision.datasets
 from torch.utils.data import DataLoader, Subset
-from src.adv.backends import Backends
-from src.adv.evasion.pgd import PGD
-from src.adv.evasion.perturbation_models import PerturbationModels
+from secml2.adv.backends import Backends
+from secml2.adv.evasion.pgd import PGD
+from secml2.adv.evasion.perturbation_models import PerturbationModels
 
-from src.metrics.classification import Accuracy
-from src.models.pytorch.base_pytorch_nn import BasePytorchClassifier
+from secml2.metrics.classification import Accuracy
+from secml2.models.pytorch.base_pytorch_nn import BasePytorchClassifier
 
 from robustbench.utils import load_model
 

src/examples/train_model.py → secml2/examples/train_model.py

@@ -3,9 +3,9 @@
 from torch.optim import Adam
 from torch.utils.data import DataLoader
 
-from src.metrics.classification import Accuracy
-from src.models.pytorch.base_pytorch_nn import BasePytorchClassifier
-from src.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
+from secml2.metrics.classification import Accuracy
+from secml2.models.pytorch.base_pytorch_nn import BasePytorchClassifier
+from secml2.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
 
 
 class MNISTNet(torch.nn.Module):

src/metrics/classification.py → secml2/metrics/classification.py

@@ -1,7 +1,7 @@
 import torch
 from torch.utils.data import DataLoader
 
-from src.models.base_model import BaseModel
+from secml2.models.base_model import BaseModel
 
 
 def accuracy(y_pred: torch.Tensor, y_true: torch.Tensor) -> torch.Tensor:

src/models/base_model.py → secml2/models/base_model.py

@@ -4,8 +4,10 @@
 import torch
 from torch.utils.data import DataLoader
 
-from src.models.data_processing.identity_data_processing import IdentityDataProcessing
-from src.models.data_processing.data_processing import DataProcessing
+from secml2.models.data_processing.identity_data_processing import (
+    IdentityDataProcessing,
+)
+from secml2.models.data_processing.data_processing import DataProcessing
 
 
 class BaseModel(ABC):

src/models/data_processing/identity_data_processing.py → secml2/models/data_processing/identity_data_processing.py

@@ -1,6 +1,6 @@
 import torch
 
-from src.models.data_processing.data_processing import DataProcessing
+from secml2.models.data_processing.data_processing import DataProcessing
 
 
 class IdentityDataProcessing(DataProcessing):

src/models/pytorch/base_pytorch_nn.py → secml2/models/pytorch/base_pytorch_nn.py

@@ -1,9 +1,9 @@
 import torch
 from torch.utils.data import DataLoader
 
-from src.models.base_model import BaseModel
-from src.models.data_processing.data_processing import DataProcessing
-from src.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
+from secml2.models.base_model import BaseModel
+from secml2.models.data_processing.data_processing import DataProcessing
+from secml2.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
 
 
 class BasePytorchClassifier(BaseModel):

src/models/pytorch/base_pytorch_trainer.py → secml2/models/pytorch/base_pytorch_trainer.py

@@ -2,7 +2,7 @@
 from torch.optim.lr_scheduler import _LRScheduler  # noqa
 from torch.utils.data import DataLoader
 
-from src.models.base_trainer import BaseTrainer
+from secml2.models.base_trainer import BaseTrainer
 
 
 class BasePyTorchTrainer(BaseTrainer):

src/models/pytorch/test/test_pytorch_nn.py → secml2/models/pytorch/test/test_pytorch_nn.py

@@ -1,9 +1,9 @@
 import torch
 from torch.optim import Adam
 
-from src.models.pytorch.base_pytorch_nn import BasePytorchClassifier
-from src.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
-from src.models.pytorch.test.base_pytorch import BasePytorchTests
+from secml2.models.pytorch.base_pytorch_nn import BasePytorchClassifier
+from secml2.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
+from secml2.models.pytorch.test.base_pytorch import BasePytorchTests
 
 
 class TestPytorchNN(BasePytorchTests):

src/models/pytorch/test/test_pytorch_trainer.py → secml2/models/pytorch/test/test_pytorch_trainer.py

@@ -1,7 +1,7 @@
 from torch.optim import Adam
 
-from src.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
-from src.models.pytorch.test.base_pytorch import BasePytorchTests
+from secml2.models.pytorch.base_pytorch_trainer import BasePyTorchTrainer
+from secml2.models.pytorch.test.base_pytorch import BasePytorchTests
 
 
 class TestPytorchTrainer(BasePytorchTests):

src/models/sklearn/base_sklearn_model.py → secml2/models/sklearn/base_sklearn_model.py

@@ -5,9 +5,9 @@
 import torch
 from torch.utils.data import DataLoader
 
-from src.data.sklearn_dataset import SklearnDataset
-from src.models.base_model import BaseModel
-from src.models.data_processing.data_processing import DataProcessing
+from secml2.data.sklearn_dataset import SklearnDataset
+from secml2.models.base_model import BaseModel
+from secml2.models.data_processing.data_processing import DataProcessing
 
 
 class BaseSklearnModel(BaseModel):

src/models/tensorflow/base_tensorflow_nn.py → secml2/models/tensorflow/base_tensorflow_nn.py

@@ -1,9 +1,9 @@
 import tensorflow as tf
 import torch
 
-from src.models.base_model import BaseModel
-from src.models.data_processing.data_processing import DataProcessing
-from src.models.tensorflow.base_tensorflow_trainer import BaseTensorflowTrainer
+from secml2.models.base_model import BaseModel
+from secml2.models.data_processing.data_processing import DataProcessing
+from secml2.models.tensorflow.base_tensorflow_trainer import BaseTensorflowTrainer
 
 
 class BaseTensorflowClassifier(BaseModel):

src/models/tensorflow/base_tensorflow_trainer.py → secml2/models/tensorflow/base_tensorflow_trainer.py

@@ -1,4 +1,4 @@
-from src.models.base_trainer import BaseTrainer
+from secml2.models.base_trainer import BaseTrainer
 
 
 class BaseTensorflowTrainer(BaseTrainer):

src/optimization/gradient_processing.py → secml2/optimization/gradient_processing.py

@@ -3,7 +3,7 @@
 import torch.linalg
 from torch.nn.functional import normalize
 
-from src.adv.evasion.perturbation_models import PerturbationModels
+from secml2.adv.evasion.perturbation_models import PerturbationModels
 
 
 class GradientProcessing:

src/optimization/initializer.py → secml2/optimization/initializer.py

@@ -1,6 +1,6 @@
 import torch
 
-from src.adv.evasion.perturbation_models import PerturbationModels
+from secml2.adv.evasion.perturbation_models import PerturbationModels
 
 
 class Initializer: