Skip to content

Allow brackets in path arguments #676

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

Merged
merged 1 commit into from
May 10, 2019
Merged

Allow brackets in path arguments #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 20 additions & 10 deletions autosklearn/ensemble_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,15 @@ def read_ensemble_preds(self):

if self.shared_mode is False:
pred_path = os.path.join(
self.dir_ensemble,
'predictions_ensemble_%s_*.npy' % self.seed)
glob.escape(self.dir_ensemble),
'predictions_ensemble_%s_*.npy' % self.seed,
)
# pSMAC
else:
pred_path = os.path.join(
self.dir_ensemble,
'predictions_ensemble_*_*.npy')
glob.escape(self.dir_ensemble),
'predictions_ensemble_*_*.npy',
)

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

for k in selected_keys:
valid_fn = glob.glob(
os.path.join(self.dir_valid, 'predictions_valid_%d_%d.npy'
% (self.read_preds[k]["seed"],
self.read_preds[k]["num_run"])))
os.path.join(
glob.escape(self.dir_valid),
'predictions_valid_%d_%d.npy' % (
self.read_preds[k]["seed"],
self.read_preds[k]["num_run"])
)
)
test_fn = glob.glob(
os.path.join(self.dir_test, 'predictions_test_%d_%d.npy' %
(self.read_preds[k]["seed"],
self.read_preds[k]["num_run"])))
os.path.join(
glob.escape(self.dir_test),
'predictions_test_%d_%d.npy' % (
self.read_preds[k]["seed"],
self.read_preds[k]["num_run"])
)
)

# TODO don't read valid and test if not changed
if len(valid_fn) == 0:
Expand Down
14 changes: 9 additions & 5 deletions autosklearn/util/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def get_smac_output_directory_for_run(self, seed):

def get_smac_output_glob(self, smac_run_id: Union[str, int] = 1) -> str:
return os.path.join(
self.temporary_directory,
glob.escape(self.temporary_directory),
'smac3-output',
'run_%s' % str(smac_run_id),
)
Expand Down Expand Up @@ -346,8 +346,9 @@ def save_model(self, model, idx, seed):
def list_all_models(self, seed):
model_directory = self.get_model_dir()
if seed >= 0:
model_files = glob.glob(os.path.join(model_directory,
'%s.*.model' % seed))
model_files = glob.glob(
os.path.join(glob.escape(model_directory), '%s.*.model' % seed)
)
else:
model_files = os.listdir(model_directory)
model_files = [os.path.join(model_directory, mf)
Expand Down Expand Up @@ -408,9 +409,11 @@ def load_ensemble(self, seed):
self.logger.warning('Directory %s does not exist' % ensemble_dir)
return None

print(seed)
if seed >= 0:
indices_files = glob.glob(os.path.join(ensemble_dir,
'%s.*.ensemble' % seed))
indices_files = glob.glob(
os.path.join(glob.escape(ensemble_dir), '%s.*.ensemble' % seed)
)
indices_files.sort()
else:
indices_files = os.listdir(ensemble_dir)
Expand All @@ -419,6 +422,7 @@ def load_ensemble(self, seed):

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

return ensemble_members_run_numbers

Expand Down