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.

Sign up for GitHub

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

Jump to bottom

Feature/sg 1059 fix ci #1350

Merged
merged 6 commits into from
Aug 7, 2023
Merged

Feature/sg 1059 fix ci #1350

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
118849c
get_requirements to handle --extra-index-url correctly
BloodAxe Aug 7, 2023
fdeeb4d
Uninstall existing SG and install the one from checkout
BloodAxe Aug 7, 2023
60a613e
get_requirements to handle --extra-index-url correctly
BloodAxe Aug 7, 2023
57b571c
Merge branch 'master' into feature/SG-1059-fix-CI
BloodAxe Aug 7, 2023
beeda8b
Merge branch 'master' into feature/SG-1059-fix-CI
BloodAxe Aug 7, 2023
320074d
Merge branch 'master' into feature/SG-1059-fix-CI
Louis-Dupont Aug 7, 2023
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
14 changes: 11 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
python3 -m venv venv
. venv/bin/activate
python3 -m pip install pip==23.1.2
cat requirements.txt | cut -f1 -d"#" | xargs -n 1 -L 1 pip install --progress-bar off
python3 -m pip install -r requirements.txt
- run:
name: edit package version
command: |
Expand All @@ -189,14 +189,22 @@ jobs:
- run:
name: setup custom environment variables
command: |
echo 'export PYTHONPATH=/home/circleci/super_gradients' >> $BASH_ENV
echo 'export UPLOAD_LOGS=FALSE' >> $BASH_ENV
- run:
name: install package
no_output_timeout: 30m
command: |
. venv/bin/activate
python3 -m pip install --extra-index-url https://pypi.ngc.nvidia.com .[pro]
python3 -m pip uninstall -y super_gradients
python3 -m pip install -e .[pro] --extra-index-url https://pypi.ngc.nvidia.com

- run:
name: install pytorch quantization package
no_output_timeout: 30m
command: |
. venv/bin/activate
python3 -m pip install pytorch-quantization==2.1.2 --extra-index-url https://pypi.ngc.nvidia.com

- run:
name: run tests with coverage
no_output_timeout: 30m
Expand Down
4 changes: 3 additions & 1 deletion src/super_gradients/sanity_check/env_sanity_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ def get_requirements(use_pro_requirements: bool) -> Optional[List[str]]:
with open(pro_requirements_path, "r") as f:
pro_requirements = f.read().splitlines()

return requirements + pro_requirements if use_pro_requirements else requirements
lines = requirements + pro_requirements if use_pro_requirements else requirements
lines = [line for line in lines if not line.startswith("--extra-index-url")] # Remove index-url lines
return lines


def check_packages():
Expand Down