Skip to content

Commit 80dc173

Browse files
committed
Allow brackets in path arguments
1 parent d7d4e03 commit 80dc173

File tree

2 files changed

+29
-15
lines changed

2 files changed

+29
-15
lines changed

autosklearn/ensemble_builder.py

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,15 @@ def read_ensemble_preds(self):
257257

258258
if self.shared_mode is False:
259259
pred_path = os.path.join(
260-
self.dir_ensemble,
261-
'predictions_ensemble_%s_*.npy' % self.seed)
260+
glob.escape(self.dir_ensemble),
261+
'predictions_ensemble_%s_*.npy' % self.seed,
262+
)
262263
# pSMAC
263264
else:
264265
pred_path = os.path.join(
265-
self.dir_ensemble,
266-
'predictions_ensemble_*_*.npy')
266+
glob.escape(self.dir_ensemble),
267+
'predictions_ensemble_*_*.npy',
268+
)
267269

268270
y_ens_files = glob.glob(pred_path)
269271
# no validation predictions so far -- no files
@@ -453,13 +455,21 @@ def get_valid_test_preds(self, selected_keys: list):
453455

454456
for k in selected_keys:
455457
valid_fn = glob.glob(
456-
os.path.join(self.dir_valid, 'predictions_valid_%d_%d.npy'
457-
% (self.read_preds[k]["seed"],
458-
self.read_preds[k]["num_run"])))
458+
os.path.join(
459+
glob.escape(self.dir_valid),
460+
'predictions_valid_%d_%d.npy' % (
461+
self.read_preds[k]["seed"],
462+
self.read_preds[k]["num_run"])
463+
)
464+
)
459465
test_fn = glob.glob(
460-
os.path.join(self.dir_test, 'predictions_test_%d_%d.npy' %
461-
(self.read_preds[k]["seed"],
462-
self.read_preds[k]["num_run"])))
466+
os.path.join(
467+
glob.escape(self.dir_test),
468+
'predictions_test_%d_%d.npy' % (
469+
self.read_preds[k]["seed"],
470+
self.read_preds[k]["num_run"])
471+
)
472+
)
463473

464474
# TODO don't read valid and test if not changed
465475
if len(valid_fn) == 0:

autosklearn/util/backend.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def get_smac_output_directory_for_run(self, seed):
244244

245245
def get_smac_output_glob(self, smac_run_id: Union[str, int] = 1) -> str:
246246
return os.path.join(
247-
self.temporary_directory,
247+
glob.escape(self.temporary_directory),
248248
'smac3-output',
249249
'run_%s' % str(smac_run_id),
250250
)
@@ -346,8 +346,9 @@ def save_model(self, model, idx, seed):
346346
def list_all_models(self, seed):
347347
model_directory = self.get_model_dir()
348348
if seed >= 0:
349-
model_files = glob.glob(os.path.join(model_directory,
350-
'%s.*.model' % seed))
349+
model_files = glob.glob(
350+
os.path.join(glob.escape(model_directory), '%s.*.model' % seed)
351+
)
351352
else:
352353
model_files = os.listdir(model_directory)
353354
model_files = [os.path.join(model_directory, mf)
@@ -408,9 +409,11 @@ def load_ensemble(self, seed):
408409
self.logger.warning('Directory %s does not exist' % ensemble_dir)
409410
return None
410411

412+
print(seed)
411413
if seed >= 0:
412-
indices_files = glob.glob(os.path.join(ensemble_dir,
413-
'%s.*.ensemble' % seed))
414+
indices_files = glob.glob(
415+
os.path.join(glob.escape(ensemble_dir), '%s.*.ensemble' % seed)
416+
)
414417
indices_files.sort()
415418
else:
416419
indices_files = os.listdir(ensemble_dir)
@@ -419,6 +422,7 @@ def load_ensemble(self, seed):
419422

420423
with open(indices_files[-1], 'rb') as fh:
421424
ensemble_members_run_numbers = pickle.load(fh)
425+
print(indices_files)
422426

423427
return ensemble_members_run_numbers
424428

0 commit comments

Comments
 (0)