Skip to content

Commit

Permalink
adding back in all of the deepuq/ folders
Browse files Browse the repository at this point in the history
  • Loading branch information
beckynevin committed Oct 25, 2024
1 parent 143c6b0 commit 57558c8
Show file tree
Hide file tree
Showing 25 changed files with 24 additions and 2,522 deletions.
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.
Expand Down
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,
Expand Down
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
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
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
Expand Up @@ -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):
Expand Down
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,
Expand Down
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 <[email protected]>"]
readme = "README.md"
Expand Down
Loading

0 comments on commit 57558c8

Please sign in to comment.