From b762d61958fe6f90943341a8e7b959344d438c68 Mon Sep 17 00:00:00 2001 From: Deng Weishi Date: Fri, 12 Jul 2024 17:52:30 +0800 Subject: [PATCH 1/2] timm_efficientdet:benchmark coverage for custom devices --- torchbenchmark/models/timm_efficientdet/__init__.py | 7 ++----- torchbenchmark/models/timm_efficientdet/loader.py | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/torchbenchmark/models/timm_efficientdet/__init__.py b/torchbenchmark/models/timm_efficientdet/__init__.py index ced8b8d357..b1af31deae 100644 --- a/torchbenchmark/models/timm_efficientdet/__init__.py +++ b/torchbenchmark/models/timm_efficientdet/__init__.py @@ -49,10 +49,6 @@ class Model(BenchmarkModel): def __init__(self, test, device, batch_size=None, extra_args=[]): super().__init__(test=test, device=device, batch_size=batch_size, extra_args=extra_args) - if not device == "cuda": - # Only implemented on CUDA because the original model code explicitly calls the `Tensor.cuda()` API - # https://github.com/rwightman/efficientdet-pytorch/blob/9cb43186711d28bd41f82f132818c65663b33c1f/effdet/data/loader.py#L114 - raise NotImplementedError("The original model code forces the use of CUDA.") # generate arguments args = get_args() # setup train and eval batch size @@ -136,7 +132,8 @@ def __init__(self, test, device, batch_size=None, extra_args=[]): mean=input_config['mean'], std=input_config['std'], num_workers=args.workers, - pin_mem=args.pin_mem) + pin_mem=args.pin_mem, + device=args.device) self.loader = prefetch(self.loader, self.device, self.NUM_OF_BATCHES) self.args = args # Only run 1 epoch diff --git a/torchbenchmark/models/timm_efficientdet/loader.py b/torchbenchmark/models/timm_efficientdet/loader.py index b2c9b03775..81b826acac 100644 --- a/torchbenchmark/models/timm_efficientdet/loader.py +++ b/torchbenchmark/models/timm_efficientdet/loader.py @@ -63,6 +63,7 @@ def create_datasets_and_loaders( anchor_labeler=labeler, transform_fn=transform_train_fn, collate_fn=collate_fn, + device=args.device ) if args.val_skip > 1: @@ -83,6 +84,7 @@ def create_datasets_and_loaders( anchor_labeler=labeler, transform_fn=transform_eval_fn, collate_fn=collate_fn, + device=args.device ) evaluator = create_evaluator(args.dataset, loader_eval.dataset, distributed=args.distributed, pred_yxyx=False) From 67f6c907a47ae133a480f470512cfefbdf519c17 Mon Sep 17 00:00:00 2001 From: Deng Weishi Date: Thu, 26 Sep 2024 16:59:06 +0800 Subject: [PATCH 2/2] update effdet --- torchbenchmark/models/timm_efficientdet/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torchbenchmark/models/timm_efficientdet/requirements.txt b/torchbenchmark/models/timm_efficientdet/requirements.txt index 2e3c8a1c8d..7d4c9d374d 100644 --- a/torchbenchmark/models/timm_efficientdet/requirements.txt +++ b/torchbenchmark/models/timm_efficientdet/requirements.txt @@ -1,2 +1,2 @@ pycocotools -git+https://github.com/rwightman/efficientdet-pytorch.git@d43c9e34cd62d22b4205831bb735f6dd83b8e881 +git+https://github.com/rwightman/efficientdet-pytorch.git@c6dff775a36cea0bf9b76c58e59f936411c5ce01