Skip to content

Fix packaging layout for PyPI publication #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fariedabuzaid merged 1 commit into from
Jul 4, 2026
Merged

Fix packaging layout for PyPI publication #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions experiments/cfair/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
__object__: src.cjd_flows.explib.base.ExperimentCollection
__object__: cjd_flows.explib.base.ExperimentCollection
name: cfair10_basedist_comparison
experiments:
- &exp_laplace
__object__: src.cjd_flows.explib.hyperopt.HyperoptExperiment
__object__: cjd_flows.explib.hyperopt.HyperoptExperiment
name: mnist_laplace
scheduler: &scheduler
__object__: ray.tune.schedulers.ASHAScheduler
Expand All @@ -18,7 +18,7 @@ experiments:
mode: min
trial_config:
dataset: &dataset
__object__: src.cjd_flows.experiments.datasets.CfairSplit
__object__: cjd_flows.experiments.datasets.CfairSplit
digit: 0
epochs: &epochs 20000
patience: &patience 50
Expand All @@ -34,7 +34,7 @@ experiments:

model_cfg:
type:
__class__: &model src.cjd_flows.flows.NiceFlow
__class__: &model cjd_flows.flows.NiceFlow
params:
coupling_layers: &coupling_layers
__eval__: tune.choice([ 2, 3, 4, 5])
Expand Down
16 changes: 8 additions & 8 deletions experiments/cifar/cifar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
__object__: src.cjd_flows.explib.base.ExperimentCollection
__object__: cjd_flows.explib.base.ExperimentCollection
name: fashion_ablation
experiments:
- &exp_rad_logN
__object__: src.cjd_flows.explib.hyperopt.HyperoptExperiment
__object__: cjd_flows.explib.hyperopt.HyperoptExperiment
name: cfair_full_radial_logN
skip: true
device: cpu
Expand All @@ -25,7 +25,7 @@ experiments:
"image_shape": [28, 28]
dataset: &dataset
class:
__class__: src.cjd_flows.explib.datasets.Cifar10Split
__class__: cjd_flows.explib.datasets.Cifar10Split
params:
space_to_depth_factor: 4
dataloc: /home/faried/Projects/USFlows/data/cifar10
Expand All @@ -36,15 +36,15 @@ experiments:
__eval__: tune.choice([32])
optim_cfg: &optim
optimizer:
__class__: src.cjd_flows.sophia.SophiaG
__class__: cjd_flows.sophia.SophiaG
params:
lr:
__eval__: 1e-3
weight_decay: 0.0

model_cfg:
type:
__class__: src.cjd_flows.flows.USFlow
__class__: cjd_flows.flows.USFlow
params:
soft_training:
__eval__: tune.choice([False])
Expand All @@ -59,7 +59,7 @@ experiments:
lu_transform: 1
householder: 0
conditioner_cls:
__class__: src.cjd_flows.networks.ConvNet2D
__class__: cjd_flows.networks.ConvNet2D
conditioner_args:
c_in: 48
c_hidden:
Expand All @@ -78,14 +78,14 @@ experiments:
nonlinearity:
__eval__: tune.choice([torch.nn.ReLU()])
base_distribution:
__object__: src.cjd_flows.distributions.RadialDistribution
__object__: cjd_flows.distributions.RadialDistribution
device: cpu
p:
__eval__: float("1")
loc:
__eval__: torch.zeros([48, 8, 8]).to("cpu")
norm_distribution:
__object__: src.cjd_flows.distributions.LogNormal
__object__: cjd_flows.distributions.LogNormal
loc:
__eval__: torch.ones([1]).to("cpu") * 6
scale:
Expand Down
16 changes: 8 additions & 8 deletions experiments/cifar/cifar_complementary.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
__object__: src.cjd_flows.explib.base.ExperimentCollection
__object__: cjd_flows.explib.base.ExperimentCollection
name: fashion_ablation
experiments:
- &exp_rad_logN
__object__: src.cjd_flows.explib.hyperopt.HyperoptExperiment
__object__: cjd_flows.explib.hyperopt.HyperoptExperiment
name: cfair_full_radial_logN
skip: true
device: cuda
Expand All @@ -25,7 +25,7 @@ experiments:
"image_shape": [28, 28]
dataset: &dataset
class:
__class__: src.cjd_flows.explib.datasets.Cifar10Split
__class__: cjd_flows.explib.datasets.Cifar10Split
params:
space_to_depth_factor: 4
dataloc: /home/faried/Projects/USFlows/data/cifar10
Expand All @@ -36,15 +36,15 @@ experiments:
__eval__: tune.choice([32])
optim_cfg: &optim
optimizer:
__class__: src.cjd_flows.sophia.SophiaG
__class__: cjd_flows.sophia.SophiaG
params:
lr:
__eval__: 1e-3
weight_decay: 0.0

model_cfg:
type:
__class__: src.cjd_flows.flows.USFlow
__class__: cjd_flows.flows.USFlow
params:
soft_training:
__eval__: tune.choice([False])
Expand All @@ -59,7 +59,7 @@ experiments:
lu_transform: 1
householder: 0
conditioner_cls:
__class__: src.cjd_flows.networks.ConvNet2D
__class__: cjd_flows.networks.ConvNet2D
conditioner_args:
c_in: 48
c_hidden:
Expand Down Expand Up @@ -97,14 +97,14 @@ experiments:
affine_conjugation: false
base_distribution:
__exact__:
__object__: src.cjd_flows.distributions.RadialDistribution
__object__: cjd_flows.distributions.RadialDistribution
device: cuda
p:
__eval__: float("1")
loc:
__eval__: torch.zeros([48, 8, 8]).to("cuda")
norm_distribution:
__object__: src.cjd_flows.distributions.LogNormal
__object__: cjd_flows.distributions.LogNormal
loc:
__eval__: torch.ones([1]).to("cuda") * 6
scale:
Expand Down
12 changes: 6 additions & 6 deletions experiments/cifar/cifar_jet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
__object__: src.cjd_flows.explib.base.ExperimentCollection
__object__: cjd_flows.explib.base.ExperimentCollection
name: cifar_jet
experiments:
- &exp_jet
__object__: src.cjd_flows.explib.hyperopt.HyperoptExperiment
__object__: cjd_flows.explib.hyperopt.HyperoptExperiment
name: cifar_jet_conditioner
skip: false
device: cuda
Expand All @@ -24,7 +24,7 @@ experiments:
"image_shape": [28, 28]
dataset: &dataset
class:
__class__: src.cjd_flows.explib.datasets.Cifar10Split
__class__: cjd_flows.explib.datasets.Cifar10Split
params:
space_to_depth_factor: 4
dataloc: /home/faried/Projects/USFlows/data/cifar10
Expand All @@ -35,15 +35,15 @@ experiments:
__eval__: tune.choice([32])
optim_cfg: &optim
optimizer:
__class__: src.cjd_flows.sophia.SophiaG
__class__: cjd_flows.sophia.SophiaG
params:
lr:
__eval__: 1e-4
weight_decay: 0.0

model_cfg:
type:
__class__: src.cjd_flows.flows.USFlow
__class__: cjd_flows.flows.USFlow
params:
soft_training:
__eval__: tune.choice([False])
Expand All @@ -62,7 +62,7 @@ experiments:
# couplings, as in the Jet architecture.
masktype: channel
conditioner_cls:
__class__: src.cjd_flows.networks.JetConditioner
__class__: cjd_flows.networks.JetConditioner
conditioner_args:
in_dims: [48, 8, 8]
# space-to-depth already patchified the image; keep 8x8=64 tokens
Expand Down
8 changes: 4 additions & 4 deletions experiments/fashion/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
__object__: src.cjd_flows.explib.base.ExperimentCollection
__object__: cjd_flows.explib.base.ExperimentCollection
name: fashion_basedist_comparison
experiments:
- &exp_laplace
__object__: src.cjd_flows.explib.hyperopt.HyperoptExperiment
__object__: cjd_flows.explib.hyperopt.HyperoptExperiment
name: mnist_laplace
scheduler: &scheduler
__object__: ray.tune.schedulers.ASHAScheduler
Expand All @@ -18,7 +18,7 @@ experiments:
mode: min
trial_config:
dataset: &dataset
__object__: src.cjd_flows.explib.datasets.FashionMnistSplit
__object__: cjd_flows.explib.datasets.FashionMnistSplit
label: 0
epochs: &epochs 10000
patience: &patience 500
Expand All @@ -34,7 +34,7 @@ experiments:

model_cfg:
type:
__class__: &model src.cjd_flows.flows.NiceFlow
__class__: &model cjd_flows.flows.NiceFlow
params:
coupling_layers: &coupling_layers
__eval__: tune.choice([2, 3, 4, 6, 8])
Expand Down
16 changes: 8 additions & 8 deletions experiments/fashion/fashion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
__object__: src.cjd_flows.explib.base.ExperimentCollection
__object__: cjd_flows.explib.base.ExperimentCollection
name: fashion_ablation
experiments:
- &exp_rad_logN
__object__: src.cjd_flows.explib.hyperopt.HyperoptExperiment
__object__: cjd_flows.explib.hyperopt.HyperoptExperiment
name: cfair_full_radial_logN
skip: true
device: cpu
Expand All @@ -25,7 +25,7 @@ experiments:
"image_shape": [28, 28]
dataset: &dataset
class:
__class__: src.cjd_flows.explib.datasets.FashionMnistSplit
__class__: cjd_flows.explib.datasets.FashionMnistSplit
params:
space_to_depth_factor: 4
dataloc: /home/faried/Projects/USFlows/data/fashion
Expand All @@ -36,15 +36,15 @@ experiments:
__eval__: tune.choice([32])
optim_cfg: &optim
optimizer:
__class__: src.cjd_flows.sophia.SophiaG
__class__: cjd_flows.sophia.SophiaG
params:
lr:
__eval__: 1e-3
weight_decay: 0.0

model_cfg:
type:
__class__: src.cjd_flows.flows.USFlow
__class__: cjd_flows.flows.USFlow
params:
soft_training:
__eval__: tune.choice([False])
Expand All @@ -59,7 +59,7 @@ experiments:
lu_transform: 1
householder: 0
conditioner_cls:
__class__: src.cjd_flows.networks.ConvNet2D
__class__: cjd_flows.networks.ConvNet2D
conditioner_args:
c_in: 48
c_hidden:
Expand All @@ -78,14 +78,14 @@ experiments:
nonlinearity:
__eval__: tune.choice([torch.nn.ReLU()])
base_distribution:
__object__: src.cjd_flows.distributions.RadialDistribution
__object__: cjd_flows.distributions.RadialDistribution
device: cpu
p:
__eval__: float("1")
loc:
__eval__: torch.zeros([48, 8, 8]).to("cpu")
norm_distribution:
__object__: src.cjd_flows.distributions.LogNormal
__object__: cjd_flows.distributions.LogNormal
loc:
__eval__: torch.ones([1]).to("cpu") * 6
scale:
Expand Down
16 changes: 8 additions & 8 deletions experiments/fashion/fashion_complementary.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
__object__: src.cjd_flows.explib.base.ExperimentCollection
__object__: cjd_flows.explib.base.ExperimentCollection
name: fashion_ablation
experiments:
- &exp_rad_logN
__object__: src.cjd_flows.explib.hyperopt.HyperoptExperiment
__object__: cjd_flows.explib.hyperopt.HyperoptExperiment
name: cfair_full_radial_logN
skip: true
device: cuda
Expand All @@ -25,7 +25,7 @@ experiments:
"image_shape": [28, 28]
dataset: &dataset
class:
__class__: src.cjd_flows.explib.datasets.FashionMnistSplit
__class__: cjd_flows.explib.datasets.FashionMnistSplit
params:
space_to_depth_factor: 4
dataloc: /home/faried/Projects/USFlows/data/fashion
Expand All @@ -36,15 +36,15 @@ experiments:
__eval__: tune.choice([32])
optim_cfg: &optim
optimizer:
__class__: src.cjd_flows.sophia.SophiaG
__class__: cjd_flows.sophia.SophiaG
params:
lr:
__eval__: 1e-3
weight_decay: 0.0

model_cfg:
type:
__class__: src.cjd_flows.flows.USFlow
__class__: cjd_flows.flows.USFlow
params:
soft_training:
__eval__: tune.choice([False])
Expand All @@ -59,7 +59,7 @@ experiments:
lu_transform: 1
householder: 0
conditioner_cls:
__class__: src.cjd_flows.networks.ConvNet2D
__class__: cjd_flows.networks.ConvNet2D
conditioner_args:
c_in: 48
c_hidden:
Expand Down Expand Up @@ -98,14 +98,14 @@ experiments:
affine_conjugation: false
base_distribution:
__exact__:
__object__: src.cjd_flows.distributions.RadialDistribution
__object__: cjd_flows.distributions.RadialDistribution
device: cuda
p:
__eval__: float("1")
loc:
__eval__: torch.zeros([48, 8, 8]).to("cuda")
norm_distribution:
__object__: src.cjd_flows.distributions.LogNormal
__object__: cjd_flows.distributions.LogNormal
loc:
__eval__: torch.ones([1]).to("cuda") * 6
scale:
Expand Down
Loading
Loading