Skip to content

Commit fccfb60

Browse files
ScitatorScitator
authored
v22: simplification 2.0 (#1395)
* v22: simplification 2.0 * + * codestile right margin moved to 89 * custom MVP works * custom MVP works 2.0 - cleanup * custom SupervisedRunner works * tests dump * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * +
1 parent 678dc06 commit fccfb60

File tree

378 files changed

+8234
-22852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

378 files changed

+8234
-22852
lines changed

‎.github/workflows/codestyle.yml

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,39 @@ jobs:
3636
# https://github.com/actions/cache/blob/master/examples.md
3737
# Note: This uses an internal pip API and may not always work
3838
# https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
39-
- name: get pip cache
40-
id: pip-cache
41-
run: |
42-
python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)"
43-
44-
- name: cache pip
45-
uses: actions/cache@v2
46-
with:
47-
path: ${{ steps.pip-cache.outputs.dir }}
48-
key: ${{ runner.os }}-${{ matrix.python-version }}-pip -${{ hashFiles('./requirements/requirements.txt') }} -${{ hashFiles('./requirements/requirements-dev.txt') }}
49-
restore-keys: |
50-
${{ runner.os }}-${{ matrix.python-version }}-pip-
51-
52-
- name: cache pip contrib
53-
uses: actions/cache@v2
54-
with:
55-
path: ${{ steps.pip-cache.outputs.dir }}
56-
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-cv.txt') }} -${{ hashFiles('./requirements/requirements-hydra.txt') }} -${{ hashFiles('./requirements/requirements-ml.txt') }} -${{ hashFiles('./requirements/requirements-nifti.txt') }} -${{ hashFiles('./requirements/requirements-optuna.txt') }} -${{ hashFiles('./requirements/requirements-mlflow.txt') }} -${{ hashFiles('./requirements/requirements-neptune.txt') }}
57-
restore-keys: |
58-
${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
59-
60-
- name: cache pip contrib [2]
61-
uses: actions/cache@v2
62-
with:
63-
path: ${{ steps.pip-cache.outputs.dir }}
64-
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-albu.txt') }}
65-
restore-keys: |
66-
${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
39+
# - name: get pip cache
40+
# id: pip-cache
41+
# run: |
42+
# python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)"
43+
44+
# - name: cache pip
45+
# uses: actions/cache@v2
46+
# with:
47+
# path: ${{ steps.pip-cache.outputs.dir }}
48+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip -${{ hashFiles('./requirements/requirements.txt') }} -${{ hashFiles('./requirements/requirements-dev.txt') }}
49+
# restore-keys: |
50+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-
51+
52+
# - name: cache pip contrib
53+
# uses: actions/cache@v2
54+
# with:
55+
# path: ${{ steps.pip-cache.outputs.dir }}
56+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-cv.txt') }} -${{ hashFiles('./requirements/requirements-hydra.txt') }} -${{ hashFiles('./requirements/requirements-ml.txt') }} -${{ hashFiles('./requirements/requirements-nifti.txt') }} -${{ hashFiles('./requirements/requirements-optuna.txt') }} -${{ hashFiles('./requirements/requirements-mlflow.txt') }} -${{ hashFiles('./requirements/requirements-neptune.txt') }}
57+
# restore-keys: |
58+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
59+
60+
# - name: cache pip contrib [2]
61+
# uses: actions/cache@v2
62+
# with:
63+
# path: ${{ steps.pip-cache.outputs.dir }}
64+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-albu.txt') }}
65+
# restore-keys: |
66+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
6767

6868
- name: install dependencies
6969
run: |
7070
# python -m pip install --upgrade --user pip
71-
pip install -r ./requirements/requirements.txt -r ./requirements/requirements-cv.txt -r ./requirements/requirements-dev.txt -r ./requirements/requirements-hydra.txt -r ./requirements/requirements-ml.txt -r ./requirements/requirements-nifti.txt -r ./requirements/requirements-optuna.txt -r ./requirements/requirements-mlflow.txt -r ./requirements/requirements-neptune.txt -r ./requirements/requirements-albu.txt
71+
pip install -r ./requirements/requirements.txt -r ./requirements/requirements-dev.txt -r ./requirements/requirements-cv.txt -r ./requirements/requirements-ml.txt -r ./requirements/requirements-optuna.txt -r ./requirements/requirements-comet.txt -r ./requirements/requirements-mlflow.txt -r ./requirements/requirements-neptune.txt -r ./requirements/requirements-wandb.txt -r ./requirements/requirements-profiler.txt
7272
python --version
7373
pip --version
7474
pip list
@@ -106,39 +106,39 @@ jobs:
106106
# https://github.com/actions/cache/blob/master/examples.md
107107
# Note: This uses an internal pip API and may not always work
108108
# https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
109-
- name: get pip cache
110-
id: pip-cache
111-
run: |
112-
python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)"
113-
114-
- name: cache pip
115-
uses: actions/cache@v2
116-
with:
117-
path: ${{ steps.pip-cache.outputs.dir }}
118-
key: ${{ runner.os }}-${{ matrix.python-version }}-pip -${{ hashFiles('./requirements/requirements.txt') }} -${{ hashFiles('./requirements/requirements-dev.txt') }}
119-
restore-keys: |
120-
${{ runner.os }}-${{ matrix.python-version }}-pip-
121-
122-
- name: cache pip contrib
123-
uses: actions/cache@v2
124-
with:
125-
path: ${{ steps.pip-cache.outputs.dir }}
126-
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-cv.txt') }} -${{ hashFiles('./requirements/requirements-hydra.txt') }} -${{ hashFiles('./requirements/requirements-ml.txt') }} -${{ hashFiles('./requirements/requirements-nifti.txt') }} -${{ hashFiles('./requirements/requirements-optuna.txt') }} -${{ hashFiles('./requirements/requirements-mlflow.txt') }} -${{ hashFiles('./requirements/requirements-neptune.txt') }}
127-
restore-keys: |
128-
${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
129-
130-
- name: cache pip contrib [2]
131-
uses: actions/cache@v2
132-
with:
133-
path: ${{ steps.pip-cache.outputs.dir }}
134-
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-albu.txt') }}
135-
restore-keys: |
136-
${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
109+
# - name: get pip cache
110+
# id: pip-cache
111+
# run: |
112+
# python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)"
113+
114+
# - name: cache pip
115+
# uses: actions/cache@v2
116+
# with:
117+
# path: ${{ steps.pip-cache.outputs.dir }}
118+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip -${{ hashFiles('./requirements/requirements.txt') }} -${{ hashFiles('./requirements/requirements-dev.txt') }}
119+
# restore-keys: |
120+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-
121+
122+
# - name: cache pip contrib
123+
# uses: actions/cache@v2
124+
# with:
125+
# path: ${{ steps.pip-cache.outputs.dir }}
126+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-cv.txt') }} -${{ hashFiles('./requirements/requirements-ml.txt') }} -${{ hashFiles('./requirements/requirements-optuna.txt') }}
127+
# restore-keys: |
128+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
129+
130+
# - name: cache pip loggers
131+
# uses: actions/cache@v2
132+
# with:
133+
# path: ${{ steps.pip-cache.outputs.dir }}
134+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-loggers -${{ hashFiles('./requirements/requirements-comet.txt') }} -${{ hashFiles('./requirements/requirements-mlflow.txt') }} -${{ hashFiles('./requirements/requirements-neptune.txt') }} -${{ hashFiles('./requirements/requirements-wandb.txt') }}
135+
# restore-keys: |
136+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-loggers
137137

138138
- name: install dependencies
139139
run: |
140140
# python -m pip install --upgrade --user pip
141-
pip install -r ./requirements/requirements.txt -r ./requirements/requirements-cv.txt -r ./requirements/requirements-dev.txt -r ./requirements/requirements-hydra.txt -r ./requirements/requirements-ml.txt -r ./requirements/requirements-optuna.txt -r ./requirements/requirements-mlflow.txt -r ./requirements/requirements-neptune.txt -r ./requirements/requirements-albu.txt
141+
pip install -r ./requirements/requirements.txt -r ./requirements/requirements-dev.txt -r ./requirements/requirements-cv.txt -r ./requirements/requirements-ml.txt -r ./requirements/requirements-optuna.txt -r ./requirements/requirements-comet.txt -r ./requirements/requirements-mlflow.txt -r ./requirements/requirements-neptune.txt -r ./requirements/requirements-wandb.txt -r ./requirements/requirements-profiler.txt
142142
python --version
143143
pip --version
144144
pip list
@@ -147,5 +147,5 @@ jobs:
147147

148148
- name: check codestyle
149149
run: |
150-
catalyst-check-codestyle --line-length 99
150+
catalyst-check-codestyle --line-length 89
151151
make check-docs

‎.github/workflows/dl_cpu.yml

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
max-parallel: 4
2121
matrix:
2222
os: [ubuntu-18.04, ubuntu-20.04, macOS-10.15] # windows-2019,
23-
python-version: [3.6, 3.7, 3.8]
23+
python-version: [3.7, 3.8]
2424
requirements: [latest]
2525
exclude:
2626
# pickle problems
@@ -67,42 +67,54 @@ jobs:
6767
python -c "req = open('./requirements/requirements.txt').read().replace('>', '=') ; open('./requirements/requirements.txt', 'w').write(req)"
6868
python -c "req = open('./requirements/requirements-cv.txt').read().replace('>', '=') ; open('./requirements/requirements-cv.txt', 'w').write(req)"
6969
python -c "req = open('./requirements/requirements-ml.txt').read().replace('>', '=') ; open('./requirements/requirements-ml.txt', 'w').write(req)"
70+
python -c "req = open('./requirements/requirements-optuna.txt').read().replace('>', '=') ; open('./requirements/requirements-optuna.txt', 'w').write(req)"
71+
python -c "req = open('./requirements/requirements-comet.txt').read().replace('>', '=') ; open('./requirements/requirements-comet.txt', 'w').write(req)"
72+
python -c "req = open('./requirements/requirements-mlflow.txt').read().replace('>', '=') ; open('./requirements/requirements-mlflow.txt', 'w').write(req)"
7073
python -c "req = open('./requirements/requirements-neptune.txt').read().replace('>', '=') ; open('./requirements/requirements-neptune.txt', 'w').write(req)"
71-
python -c "req = open('./requirements/requirements-albu.txt').read().replace('>', '=') ; open('./requirements/requirements-albu.txt', 'w').write(req)"
74+
python -c "req = open('./requirements/requirements-wandb.txt').read().replace('>', '=') ; open('./requirements/requirements-wandb.txt', 'w').write(req)"
7275
python -c "req = open('./requirements/requirements-profiler.txt').read().replace('>', '=') ; open('./requirements/requirements-profiler.txt', 'w').write(req)"
7376
7477
# https://github.com/actions/cache/blob/master/examples.md
7578
# Note: This uses an internal pip API and may not always work
7679
# https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow
77-
# - name: get pip cache dir
78-
# id: pip-cache
79-
# run: |
80-
# python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)"
81-
#
82-
# - name: cache pip
83-
# uses: actions/cache@v2
84-
# with:
85-
# path: ${{ steps.pip-cache.outputs.dir }}
86-
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip -${{ hashFiles('./requirements/requirements.txt') }} -${{ hashFiles('./requirements/requirements-dev.txt') }}
87-
# restore-keys: |
88-
# ${{ runner.os }}-${{ matrix.python-version }}-pip-
89-
#
90-
# - name: cache pip contrib
91-
# uses: actions/cache@v2
92-
# with:
93-
# path: ${{ steps.pip-cache.outputs.dir }}
94-
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip -${{ hashFiles('./requirements/requirements-cv.txt') }} -${{ hashFiles('./requirements/requirements-hydra.txt') }} -${{ hashFiles('./requirements/requirements-ml.txt') }} -${{ hashFiles('./requirements/requirements-optuna.txt') }} -${{ hashFiles('./requirements/requirements-mlflow.txt') }} -${{ hashFiles('./requirements/requirements-nifti.txt') }}
95-
# restore-keys: |
96-
# ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
97-
#
80+
# - name: get pip cache
81+
# id: pip-cache
82+
# run: |
83+
# python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)"
84+
85+
# - name: cache pip
86+
# uses: actions/cache@v2
87+
# with:
88+
# path: ${{ steps.pip-cache.outputs.dir }}
89+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip -${{ hashFiles('./requirements/requirements.txt') }} -${{ hashFiles('./requirements/requirements-dev.txt') }}
90+
# restore-keys: |
91+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-
92+
93+
# - name: cache pip contrib
94+
# uses: actions/cache@v2
95+
# with:
96+
# path: ${{ steps.pip-cache.outputs.dir }}
97+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib -${{ hashFiles('./requirements/requirements-cv.txt') }} -${{ hashFiles('./requirements/requirements-ml.txt') }} -${{ hashFiles('./requirements/requirements-optuna.txt') }}
98+
# restore-keys: |
99+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-contrib
100+
101+
# - name: cache pip loggers
102+
# uses: actions/cache@v2
103+
# with:
104+
# path: ${{ steps.pip-cache.outputs.dir }}
105+
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-loggers -${{ hashFiles('./requirements/requirements-comet.txt') }} -${{ hashFiles('./requirements/requirements-mlflow.txt') }} -${{ hashFiles('./requirements/requirements-neptune.txt') }} -${{ hashFiles('./requirements/requirements-wandb.txt') }}
106+
# restore-keys: |
107+
# ${{ runner.os }}-${{ matrix.python-version }}-pip-loggers
108+
98109
- name: install dependencies
99110
run: |
100111
# python -m pip install --upgrade --user pip
101-
pip install -r ./requirements/requirements.txt -r ./requirements/requirements-cv.txt -r ./requirements/requirements-dev.txt -r ./requirements/requirements-hydra.txt -r ./requirements/requirements-ml.txt -r ./requirements/requirements-optuna.txt -r ./requirements/requirements-mlflow.txt -r ./requirements/requirements-nifti.txt -r ./requirements/requirements-neptune.txt -r ./requirements/requirements-albu.txt -r ./requirements/requirements-profiler.txt
112+
pip install -r ./requirements/requirements.txt -r ./requirements/requirements-dev.txt -r ./requirements/requirements-cv.txt -r ./requirements/requirements-ml.txt -r ./requirements/requirements-optuna.txt -r ./requirements/requirements-comet.txt -r ./requirements/requirements-mlflow.txt -r ./requirements/requirements-neptune.txt -r ./requirements/requirements-wandb.txt -r ./requirements/requirements-profiler.txt
102113
python --version
103114
pip --version
104115
pip list
105116
shell: bash
117+
106118
# <- standard block end ->
107119

108120
- name: check examples
@@ -112,7 +124,3 @@ jobs:
112124
MKL_NUM_THREADS: "1"
113125
run: |
114126
CATALYST_COMPUTE_PER_CLASS_METRICS="1" OMP_NUM_THREADS="1" MKL_NUM_THREADS="1" pytest .
115-
pip install -e .
116-
OMP_NUM_THREADS="1" MKL_NUM_THREADS="1" cd examples && bash mnist_stages/run_config.sh && cd ..
117-
OMP_NUM_THREADS="1" MKL_NUM_THREADS="1" cd examples && bash mnist_stages/run_hydra.sh && cd ..
118-
OMP_NUM_THREADS="1" MKL_NUM_THREADS="1" cd examples && bash mnist_stages/run_tune.sh && cd ..

0 commit comments

Comments
 (0)