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: Making the BaseOptions class compatible with jupyter notebooks #14

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
170 changes: 170 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@

# Created by https://www.toptal.com/developers/gitignore/api/python
# Edit at https://www.toptal.com/developers/gitignore?templates=python

#Project specific
checkpoints

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

# End of https://www.toptal.com/developers/gitignore/api/python
Binary file removed data/__init__.pyc
Binary file not shown.
Binary file removed data/aligned_dataset.pyc
Binary file not shown.
Binary file removed data/base_data_loader.pyc
Binary file not shown.
Binary file removed data/base_dataset.pyc
Binary file not shown.
Binary file removed data/image_folder.pyc
Binary file not shown.
Binary file removed data/unaligned_dataset.pyc
Binary file not shown.
Binary file removed models/__init__.pyc
Binary file not shown.
Binary file removed models/base_model.pyc
Binary file not shown.
Binary file removed models/cycle_gan_model.pyc
Binary file not shown.
Binary file removed models/networks.pyc
Binary file not shown.
Binary file removed models/pix2pix_model.pyc
Binary file not shown.
Binary file removed models/spectral_norm.pyc
Binary file not shown.
Binary file removed options/__init__.pyc
Binary file not shown.
12 changes: 6 additions & 6 deletions options/base_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,20 @@ def initialize(self, parser):
self.initialized = True
return parser

def gather_options(self):
def gather_options(self, parser_args = None):
# initialize parser with basic options
parser = argparse.ArgumentParser(
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser = self.initialize(parser)

# get the basic options
opt, _ = parser.parse_known_args()
opt, _ = parser.parse_known_args(args=parser_args)

# modify model-related parser options
model_name = opt.model
model_option_setter = models.get_option_setter(model_name)
parser = model_option_setter(parser, self.isTrain)
opt, _ = parser.parse_known_args() # parse again with the new defaults
opt, _ = parser.parse_known_args(args=parser_args) # parse again with the new defaults

# modify dataset-related parser options
dataset_name = opt.dataset_mode
Expand All @@ -69,7 +69,7 @@ def gather_options(self):

self.parser = parser

return parser.parse_args()
return parser.parse_args(args=parser_args)

def print_options(self, opt):
message = ''
Expand All @@ -91,12 +91,12 @@ def print_options(self, opt):
opt_file.write(message)
opt_file.write('\n')

def parse(self):
def parse(self, parser_args = None):

if self.initialized:
return self.opt
else:
opt = self.gather_options()
opt = self.gather_options(parser_args=parser_args)
opt.isTrain = self.isTrain # train or test

# process opt.suffix
Expand Down
Binary file removed options/base_options.pyc
Binary file not shown.
Binary file removed options/test_options.pyc
Binary file not shown.
Binary file removed options/train_options.pyc
Binary file not shown.
Binary file removed util/__init__.pyc
Binary file not shown.
Binary file removed util/html.pyc
Binary file not shown.
Binary file removed util/image_pool.pyc
Binary file not shown.
Binary file removed util/util.pyc
Binary file not shown.
Binary file removed util/visualizer.pyc
Binary file not shown.