Skip to content
This repository has been archived by the owner on Dec 1, 2021. It is now read-only.

Unify 2 types of config format into lmnet config #798

Merged
merged 8 commits into from Feb 13, 2020
Merged

Unify 2 types of config format into lmnet config #798

merged 8 commits into from Feb 13, 2020

Conversation

tfujiwar
Copy link
Contributor

@tfujiwar tfujiwar commented Feb 6, 2020

Overview

This PR is preparation for moving train.py and predict.py from lmnet/executor to blueoil/cmd (#746). This PR aims for throwing blueoil config away and unifying 2 types of config format into lmnet config.

Important changes

init.py is updated to generate lmnet config instead of blueoil config. generate_lmnet_config.py and config template files are updated a little according to this change. train.py is also updated to accept lmnet config.

  • blueoil/cmd/init.py
  • blueoil/cmd/train.py
  • blueoil/generate_lmnet_config.py
  • blueoil/templates/lmnet/classification.tpl.py
  • blueoil/templates/lmnet/object_detection.tpl.py
  • blueoil/templates/lmnet/semantic_segmentation.tpl.py

E2E test updates

The E2E test code is also updated according to config format updates. The config files for blueoil test are removed and the test scripts are updated to generate them on-the-fly.

  • tests/e2e/conftest.py
  • tests/e2e/test_classification.py
  • tests/e2e/test_keypoint_detection.py
  • tests/e2e/test_object_detection.py
  • tests/e2e/test_semantic_segmentation.py
  • tests/fixtures/configs/*.yaml (deleted)

@blueoil-butler blueoil-butler bot added the CI: auto-run Run CI automatically label Feb 6, 2020
@tfujiwar tfujiwar changed the title Switch config file format of Blueoil CLI Unify 2 types of config format into lmnet config Feb 6, 2020
@tfujiwar tfujiwar marked this pull request as ready for review February 10, 2020 02:34
@bo-code-review-bot
Copy link

This PR needs Approvals as follows.

  • Ownership Approval for / from iizukak, tkng, ruimashita
  • Readability Approval for Python from tkng, tsawada

Please choose reviewers and requet reviews!

Click to see how to approve each reviews

You can approve this PR by triggered comments as follows.

  • Approve all reviews requested to you (readability and ownership) and LGTM review
    Approval, LGTM

  • Approve all ownership reviews
    Ownership Approval or OA

  • Approve all readability reviews
    Readability Approval or RA

  • Approve specified review targets

    • Example of Ownership Reviewer of /: Ownership Approval for / or OA for /
    • Example of Readability Reviewer of Python: Readability Approval for Python or RA for Python
  • Approve LGTM review
    LGTM

See all trigger comments

Please replace [Target] to review target

  • Ownership Approval
    • Ownership Approval for [Target]
    • OA for [Target]
    • Ownership Approval
    • OA
    • Approval
  • Readability Approval
    • Readability Approval for [Target]
    • RA for [Target]
    • [Target] Readability Approval
    • [Target] RA
    • Readability Approval
    • RA
    • Approval
  • LGTM
    • LGTM
    • lgtm

@tfujiwar tfujiwar changed the title Unify 2 types of config format into lmnet config [WIP] Unify 2 types of config format into lmnet config Feb 10, 2020
@tfujiwar tfujiwar changed the title [WIP] Unify 2 types of config format into lmnet config Unify 2 types of config format into lmnet config Feb 12, 2020
Copy link
Member

@iizukak iizukak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ownership Approval

Copy link
Contributor

@tsawada tsawada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Readability Approval

Copy link
Contributor

@tsawada tsawada left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Readability Approval

@tfujiwar
Copy link
Contributor Author

/ready

@bo-mergebot
Copy link
Contributor

bo-mergebot bot commented Feb 12, 2020

⏳Merge job is queued...

@bo-mergebot
Copy link
Contributor

bo-mergebot bot commented Feb 12, 2020

😥Status check failed. Please fix problems and send /ready again.

tests/e2e/conftest.py Outdated Show resolved Hide resolved
Co-Authored-By: Kentaro Iizuka <iizuka.kentaro@gmail.com>
@tfujiwar
Copy link
Contributor Author

/ready

@bo-mergebot
Copy link
Contributor

bo-mergebot bot commented Feb 13, 2020

⏳Merge job is queued...

@bo-mergebot bo-mergebot bot merged commit b06be92 into blue-oil:master Feb 13, 2020
@tfujiwar tfujiwar deleted the unify-config-format branch February 13, 2020 02:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
CI: auto-run Run CI automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants