From 0432261709d657d4b8aec7684417fde33d3079f8 Mon Sep 17 00:00:00 2001 From: JanLeyva Date: Sat, 19 Mar 2022 16:27:14 +0100 Subject: [PATCH 1/2] changed hm_convert.py file --- mmf_cli/hm_convert.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mmf_cli/hm_convert.py b/mmf_cli/hm_convert.py index ca088ca7c..5710b795d 100644 --- a/mmf_cli/hm_convert.py +++ b/mmf_cli/hm_convert.py @@ -35,12 +35,12 @@ def __init__(self): self.configuration = Configuration() def assert_files(self, folder): - files_needed = self.JSONL_PHASE_ONE_FILES - phase_one = True + files_needed = self.JSONL_PHASE_TWO_FILES + phase_one = False for file in files_needed: try: assert PathManager.exists( - os.path.join(folder, "data", file) + os.path.join(folder, file) ), f"{file} doesn't exist in {folder}" except AssertionError: phase_one = False @@ -49,7 +49,7 @@ def assert_files(self, folder): files_needed = self.JSONL_PHASE_TWO_FILES for file in files_needed: assert PathManager.exists( - os.path.join(folder, "data", file) + os.path.join(folder, file) ), f"{file} doesn't exist in {folder}" else: warnings.warn( @@ -62,7 +62,7 @@ def assert_files(self, folder): exists = False for file in files_needed: - exists = exists or PathManager.exists(os.path.join(folder, "data", file)) + exists = exists or PathManager.exists(os.path.join(folder, file)) if not exists: raise AssertionError("Neither img or img.tar.gz exists in current zip") From afac8928d9702a3cd8eabffb67b6ec466533a7d1 Mon Sep 17 00:00:00 2001 From: JanLeyva Date: Sat, 19 Mar 2022 16:48:53 +0100 Subject: [PATCH 2/2] defaults.yaml and builder fixed --- mmf/configs/defaults.yaml | 16 ++++++++-------- mmf/datasets/builders/hateful_memes/builder.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mmf/configs/defaults.yaml b/mmf/configs/defaults.yaml index 33a1ce37e..26432d6ce 100644 --- a/mmf/configs/defaults.yaml +++ b/mmf/configs/defaults.yaml @@ -284,8 +284,8 @@ env: # Config path for dataset zoo, can be overridden via environment # variable MMF_DATASET_ZOO as well. - dataset_zoo: ${env:MMF_DATASET_ZOO,configs/zoo/datasets.yaml} - model_zoo: ${env:MMF_MODEL_ZOO, configs/zoo/models.yaml} + dataset_zoo: ${oc.env:MMF_DATASET_ZOO,configs/zoo/datasets.yaml} + model_zoo: ${oc.env:MMF_MODEL_ZOO, configs/zoo/models.yaml} # Similar to cache dir, but can be used if specifically want to override # where MMF stores your data. Default would be cache_dir/data. @@ -294,32 +294,32 @@ env: # Directory for saving checkpoints and other metadata # Use MMF_SAVE_DIR or env.save_dir to override - save_dir: ${env:MMF_SAVE_DIR, ./save} + save_dir: ${oc.env:MMF_SAVE_DIR, ./save} # Directory for saving logs, default is "logs" inside the save folder # If log_dir is specifically passed, logs will be written inside that folder # Use MMF_LOG_DIR or env.log_dir to override - log_dir: ${env:MMF_LOG_DIR,} + log_dir: ${oc.env:MMF_LOG_DIR,""} # Directory for saving reports, if not passed a opts based folder will be generated # inside save_dir/reports and reports will be saved there # Use MMF_REPORT_DIR or env.report_dir to override - report_dir: ${env:MMF_REPORT_DIR,} + report_dir: ${oc.env:MMF_REPORT_DIR,""} # Log directory for tensorboard, default points to same as logs # Only used when training.tensorboard is enabled. # Use MMF_TENSORBOARD_LOGDIR or env.tensorboard_logdir to override - tensorboard_logdir: ${env:MMF_TENSORBOARD_LOGDIR,} + tensorboard_logdir: ${oc.env:MMF_TENSORBOARD_LOGDIR,""} # Log directory for Weights and Biases, default points to same as logs # Only used when training.wandb is enabled. # Use MMF_WANDB_LOGDIR or env.wandb_logdir to override - wandb_logdir: ${env:MMF_WANDB_LOGDIR,} + wandb_logdir: ${oc.env:MMF_WANDB_LOGDIR,""} # User directory where user can keep their own models independent of MMF # This allows users to create projects which only include MMF as dependency # Use MMF_USER_DIR or env.user_dir to specify - user_dir: ${env:MMF_USER_DIR,} + user_dir: ${oc.env:MMF_USER_DIR,""} ### # Configuration for the distributed setup diff --git a/mmf/datasets/builders/hateful_memes/builder.py b/mmf/datasets/builders/hateful_memes/builder.py index 05fed5a70..ea3be084e 100644 --- a/mmf/datasets/builders/hateful_memes/builder.py +++ b/mmf/datasets/builders/hateful_memes/builder.py @@ -49,7 +49,7 @@ def build(self, config, *args, **kwargs): "datasets", self.dataset_name, "defaults", - "annotations", + "images", "train.jsonl", ) )