Skip to content

Commit 3083ef8

Browse files
authored
Small fixes for runner/utils and code owners update (#118)
* Fix for dummy run work and error type addition in SW configuration * pd.DataFrame.drop calls with keywords * Codeowners update * Python version and requirements update
1 parent 7e0fc7f commit 3083ef8

File tree

8 files changed

+25
-26
lines changed

8 files changed

+25
-26
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#owners and reviewers
2-
cuml_bench/* @Pahandrovich @Alexsandruss @masdevas
3-
daal4py_bench/* @Pahandrovich @Alexsandruss @agorshk
4-
datasets/* @Alexsandruss @itearsl @masdevas
5-
modelbuilders_bench/* @Pahandrovich @agorshk
6-
report_generator/* @Pahandrovich @Alexsandruss
7-
sklearn_bench/* @Pahandrovich @Alexsandruss @agorshk
8-
xgboost_bench/* @Pahandrovich @agorshk
9-
*.md @outoftardis
2+
cuml_bench/* @Alexsandruss
3+
daal4py_bench/* @Alexsandruss @samir-nasibli
4+
datasets/* @Alexsandruss
5+
modelbuilders_bench/* @Alexsandruss
6+
report_generator/* @Alexsandruss
7+
sklearn_bench/* @Alexsandruss @samir-nasibli
8+
xgboost_bench/* @Alexsandruss
9+
*.md @Alexsandruss @maria-Petrova

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
22
- name: python.version
3-
value: "3.8"
3+
value: "3.9"
44

55
jobs:
66
- job: Linux_Sklearn
@@ -45,7 +45,7 @@ jobs:
4545
steps:
4646
- script: |
4747
conda update -y -q conda
48-
conda create -n bench -q -y -c conda-forge python=3.7 pandas xgboost scikit-learn daal4py tqdm requests
48+
conda create -n bench -q -y -c conda-forge python=3.9 pandas xgboost scikit-learn daal4py tqdm requests
4949
displayName: Create Anaconda environment
5050
- script: |
5151
. /usr/share/miniconda/etc/profile.d/conda.sh

daal4py_bench/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
scikit-learn
2-
pandas < 1.3.0
1+
scikit-learn < 1.1 # TODO: remove after scikit-learn-intelex release with fix
2+
pandas
33
daal4py
44
openpyxl
55
tqdm

datasets/loader_classification.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def airline_ohe(dataset_dir: Path) -> bool:
159159
for local_url in [local_url_train, local_url_test]:
160160
df = pd.read_csv(local_url, nrows=1000000
161161
if local_url.endswith('train-10m.csv') else None)
162-
X = df.drop('dep_delayed_15min', 1)
162+
X = df.drop(labels=['dep_delayed_15min'], axis=1)
163163
y: Any = df["dep_delayed_15min"]
164164

165165
y_num = np.where(y == "Y", 1, 0)
@@ -208,7 +208,7 @@ def bosch(dataset_dir: Path) -> bool:
208208
logging.info(f'{dataset_name} is loaded, started parsing...')
209209
X = pd.read_csv(local_url, index_col=0, compression='zip', dtype=np.float32)
210210
y = X.iloc[:, -1].to_numpy(dtype=np.float32)
211-
X.drop(X.columns[-1], axis=1, inplace=True)
211+
X.drop(labels=[X.columns[-1]], axis=1, inplace=True)
212212
X_np = X.to_numpy(dtype=np.float32)
213213
X_train, X_test, y_train, y_test = train_test_split(X_np, y, random_state=77,
214214
test_size=0.2,

runner.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,13 @@ class GenerationArgs:
258258

259259
dataset_name = f'synthetic_{gen_args.type}'
260260

261-
if not args.dummy_run:
262-
dataset_path = utils.find_or_gen_dataset(gen_args,
263-
datasets_root, files.values())
264-
if dataset_path is None:
265-
logging.warning(
266-
f'Dataset {dataset_name} could not be generated. \n'
267-
)
268-
continue
261+
dataset_path = utils.find_or_gen_dataset(gen_args,
262+
datasets_root, files.values())
263+
if dataset_path is None:
264+
logging.warning(
265+
f'Dataset {dataset_name} could not be generated. \n'
266+
)
267+
continue
269268

270269
paths = ''
271270
for data_path, data_file in files.items():

sklearn_bench/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scikit-learn
1+
scikit-learn < 1.1 # TODO: remove after scikit-learn-intelex release with fix
22
pandas
33
scikit-learn-intelex
44
openpyxl

utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def get_sw_parameters() -> Dict[str, Dict[str, Any]]:
172172
if gpu_processes != '':
173173
print(f'There are running processes on GPU:\n{gpu_processes}',
174174
file=sys.stderr)
175-
except (FileNotFoundError, json.JSONDecodeError):
175+
except (FileNotFoundError, json.JSONDecodeError, TypeError):
176176
pass
177177

178178
# get python packages info from conda
@@ -186,7 +186,7 @@ def get_sw_parameters() -> Dict[str, Dict[str, Any]]:
186186
if col in pkg:
187187
pkg_info[col] = pkg[col]
188188
sw_params[pkg['name']] = pkg_info
189-
except (FileNotFoundError, json.JSONDecodeError):
189+
except (FileNotFoundError, json.JSONDecodeError, TypeError):
190190
pass
191191

192192
return sw_params

xgboost_bench/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
scikit-learn
2-
pandas==1.3.5
2+
pandas
33
xgboost
44
openpyxl
55
tqdm

0 commit comments

Comments
 (0)