Skip to content
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.

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

Feature/package reorg #189

Merged
merged 5 commits into from
Oct 25, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
adding back in all of the deepuq/ folders
beckynevin committed Oct 25, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 57558c8928fa12de7e1afe019814e9a31b291cb8
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [0.1.2] - 2024-10-25
### Fixed
- Decided to rename src/ to deepuq/ in order for easier imports

## [0.1.1] - 2024-10-23
### Fixed
- Fixed packaging to enable use of commands for running scripts.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/data/__init__.py → deepuq/data/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from src.data.data import MyDataLoader, DataPreparation
from deepuq.data.data import MyDataLoader, DataPreparation

DataModules = {
"MyDataLoader": MyDataLoader,
File renamed without changes.
2 changes: 1 addition & 1 deletion src/models/__init__.py → deepuq/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from src.models.models import ModelLoader
from deepuq.models.models import ModelLoader

ModelModules = {"ModelLoader": ModelLoader}
File renamed without changes.
20 changes: 7 additions & 13 deletions src/scripts/DeepEnsemble.py → deepuq/scripts/DeepEnsemble.py
Original file line number Diff line number Diff line change
@@ -7,19 +7,13 @@
import torch
from torch.utils.data import TensorDataset, DataLoader

# from scripts import train, models, io
from src.train import train
from src.models import models
from src.data import DataModules
from src.models import ModelModules
from src.utils.config import Config
from src.utils.defaults import DefaultsDE
from src.data.data import DataPreparation, MyDataLoader

# from analyze.analyze import AggregateCheckpoints

# from plots import Plots

from deepuq.train import train
from deepuq.models import models
from deepuq.data import DataModules
from deepuq.models import ModelModules
from deepuq.utils.config import Config
from deepuq.utils.defaults import DefaultsDE
from deepuq.data.data import DataPreparation, MyDataLoader

def parse_args():
"""Parses command-line (or config) arguments for the DeepEnsemble script.
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@
from torch.utils.data import TensorDataset, DataLoader

# from scripts import train, models, io
from src.train import train
from src.models import models
from src.data import DataModules
from src.models import ModelModules
from src.utils.config import Config
from src.utils.defaults import DefaultsDER
from src.data.data import DataPreparation, MyDataLoader
from deepuq.train import train
from deepuq.models import models
from deepuq.data import DataModules
from deepuq.models import ModelModules
from deepuq.utils.config import Config
from deepuq.utils.defaults import DefaultsDER
from deepuq.data.data import DataPreparation, MyDataLoader

# from plots import Plots

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/train/train.py → deepuq/train/train.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
import glob
import numpy as np
import matplotlib.pyplot as plt
from src.models import models
from deepuq.models import models


def set_random_seeds(seed_value=42):
File renamed without changes.
2 changes: 1 addition & 1 deletion src/utils/config.py → deepuq/utils/config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Optional
import os
import yaml
from src.utils.defaults import (
from deepuq.utils.defaults import (
DefaultsDE,
DefaultsDER,
DefaultsAnalysis,
File renamed without changes.
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.poetry]
name = "DeepUQ"
packages = [{include = "src"}]
version = "0.1.1"
packages = [{include = "deepuq"}]
version = "0.1.2"
description = "a package for investigating and comparing the predictive uncertainties from deep learning models"
authors = ["beckynevin <beckynevin@gmail.com>"]
readme = "README.md"
379 changes: 0 additions & 379 deletions src/scripts/LossFunctions.py

This file was deleted.

Empty file removed src/scripts/__version__.py
Empty file.
343 changes: 0 additions & 343 deletions src/scripts/old_analysis/Aleatoric.py

This file was deleted.

327 changes: 0 additions & 327 deletions src/scripts/old_analysis/AleatoricNHidden.py

This file was deleted.

460 changes: 0 additions & 460 deletions src/scripts/old_analysis/Aleatoric_and_inits.py

This file was deleted.

396 changes: 0 additions & 396 deletions src/scripts/old_analysis/AleatoricandEpistemic.py

This file was deleted.

312 changes: 0 additions & 312 deletions src/scripts/old_analysis/Epistemic.py

This file was deleted.

279 changes: 0 additions & 279 deletions src/scripts/old_analysis/ParityPlotTest.py

This file was deleted.