-
Notifications
You must be signed in to change notification settings - Fork 251
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
Extending makefile for OpenVINO, TensorFlow and PyTorch backends #1449
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,128 @@ | ||
PYLINT_VERSION := 2.13.9 | ||
JUNITXML_PATH ?= nncf-tests.xml | ||
|
||
install-onnx-dev: | ||
ifdef DATA | ||
DATA_ARG := --data $(DATA) | ||
endif | ||
|
||
############################################################################### | ||
# ONNX backend | ||
install-onnx-test: | ||
pip install -U pip | ||
pip install -e .[onnx] | ||
pip install -r tests/onnx/requirements.txt | ||
pip install -r tests/cross_fw/install/requirements.txt | ||
pip install -r tests/onnx/benchmarking/requirements.txt | ||
pip install -r examples/post_training_quantization/onnx/mobilenet_v2/requirements.txt | ||
|
||
# Install pylint | ||
pip install pylint==2.13.9 | ||
install-onnx-dev: install-onnx-test | ||
pip install pylint==$(PYLINT_VERSION) | ||
|
||
test-onnx: | ||
pytest tests/onnx --junitxml ${JUNITXML_PATH} | ||
|
||
PYFILES := $(shell find examples/post_training_quantization/onnx -type f -name "*.py") | ||
ONNX_PYFILES := $(shell find examples/post_training_quantization/onnx -type f -name "*.py") | ||
pylint-onnx: | ||
pylint --rcfile .pylintrc \ | ||
nncf/experimental/onnx \ | ||
nncf/quantization \ | ||
tests/onnx \ | ||
$(PYFILES) | ||
$(ONNX_PYFILES) | ||
|
||
test-install-onnx: | ||
pytest tests/cross_fw/install/ --backend onnx --junitxml ${JUNITXML_PATH} | ||
pytest tests/cross_fw/install/ -s \ | ||
--backend onnx \ | ||
--junitxml ${JUNITXML_PATH} | ||
|
||
############################################################################### | ||
# OpenVino backend | ||
install-openvino-test: | ||
pip install -U pip | ||
pip install -e .[openvino] | ||
pip install -r tests/openvino/requirements.txt | ||
pip install -r tests/cross_fw/install/requirements.txt | ||
pip install -r examples/experimental/openvino/bert/requirements.txt | ||
pip install -r examples/experimental/openvino/yolo_v5/requirements.txt | ||
|
||
install-openvino-dev: install-openvino-test | ||
pip install pylint==$(PYLINT_VERSION) | ||
|
||
test-openvino: | ||
pytest tests/openvino --junitxml ${JUNITXML_PATH} | ||
|
||
pylint-openvino: | ||
pylint --rcfile .pylintrc \ | ||
nncf/openvino/ \ | ||
tests/openvino/ \ | ||
examples/experimental/openvino/ | ||
|
||
test-install-openvino: | ||
pytest tests/cross_fw/install -s \ | ||
--backend openvino \ | ||
--junitxml ${JUNITXML_PATH} | ||
|
||
############################################################################### | ||
# TensorFlow backend | ||
install-tensorflow-test: | ||
pip install -U pip | ||
pip install -e .[tf] | ||
pip install -r tests/tensorflow/requirements.txt | ||
pip install -r tests/cross_fw/install/requirements.txt | ||
pip install -r examples/tensorflow/requirements.txt | ||
|
||
install-tensorflow-dev: install-tensorflow-test | ||
pip install pylint==$(PYLINT_VERSION) | ||
|
||
test-tensorflow: | ||
pytest tests/common tests/tensorflow \ | ||
--junitxml ${JUNITXML_PATH} \ | ||
$(DATA_ARG) | ||
|
||
pylint-tensorflow: | ||
pylint --rcfile .pylintrc \ | ||
nncf/tensorflow \ | ||
nncf/experimental/tensorflow \ | ||
tests/tensorflow \ | ||
tests/experimental/tensorflow \ | ||
examples/tensorflow | ||
|
||
test-install-tensorflow: | ||
pytest tests/cross_fw/install/ -s --backend tf --junitxml ${JUNITXML_PATH} | ||
|
||
############################################################################### | ||
# PyTorch backend | ||
install-torch-test: | ||
pip install -U pip | ||
pip install -e .[torch] | ||
pip install -r tests/torch/requirements.txt | ||
pip install -r tests/cross_fw/install/requirements.txt | ||
pip install -r examples/torch/requirements.txt | ||
|
||
install-torch-dev: install-torch-test | ||
pip install pylint==$(PYLINT_VERSION) | ||
|
||
test-torch: | ||
pytest tests/common tests/torch --junitxml ${JUNITXML_PATH} $(DATA_ARG) | ||
|
||
pylint-torch: | ||
pylint --rcfile .pylintrc \ | ||
nncf/common \ | ||
ljaljushkin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
nncf/config \ | ||
nncf/api \ | ||
nncf/torch \ | ||
nncf/experimental/torch \ | ||
tests/common \ | ||
tests/torch \ | ||
examples/torch \ | ||
examples/experimental/torch | ||
|
||
test-install-torch-cpu: | ||
pytest tests/cross_fw/install/ -s \ | ||
--backend torch \ | ||
--host-configuration cpu \ | ||
--junitxml ${JUNITXML_PATH} | ||
|
||
test-install-torch-gpu: | ||
pytest tests/cross_fw/install -s \ | ||
--backend torch \ | ||
--junitxml ${JUNITXML_PATH} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
datasets | ||
evaluate | ||
transformers | ||
torch | ||
openvino-dev | ||
numpy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
yolov5 | ||
openvino-dev | ||
torch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
""" | ||
Copyright (c) 2022 Intel Corporation | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
""" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a widely used practice in Python repos is
make style
that fixes code structure and imports automatically. It is based on black and isort. Can we have the same?Here is an example:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AlexKoff88 that it is used in transformers doesn't automatically mean that this is a widely used practice.
It would, however, be nice to have a similar functionality. I considered adding
black
before, but the resulting style is pretty much unconfigurable and goes against our current code style at least in terms of used string quoting symbols. Furthermore,black
andisort
frequently conflict with each other, and also running black/isort does not guarantee that pylint will then pass.I suggest to keep style out of this PR and review the options for style improvements at a later date.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AlexKoff88, @vshampor I will try to cover this aspect in another PR.