From 7af97acccfef14d87b74f5dd758d36da9685c416 Mon Sep 17 00:00:00 2001
From: Tim Laibacher <tim.laibacher@idiap.ch>
Date: Mon, 29 Apr 2019 13:55:40 +0200
Subject: [PATCH] remove cudatoolkit pin
---
bob/ip/binseg/engine/inferencer.py | 6 +++---
conda/meta.yaml | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/bob/ip/binseg/engine/inferencer.py b/bob/ip/binseg/engine/inferencer.py
index df60d18d..650583fc 100644
--- a/bob/ip/binseg/engine/inferencer.py
+++ b/bob/ip/binseg/engine/inferencer.py
@@ -155,7 +155,7 @@ def do_inference(
"f1_score"])
# Report and Averages
- metrics_file = "Metrics_{}.csv".format(model.name)
+ metrics_file = "Metrics.csv".format(model.name)
metrics_path = os.path.join(results_subfolder, metrics_file)
logger.info("Saving average over all input images: {}".format(metrics_file))
@@ -173,7 +173,7 @@ def do_inference(
# Plotting
np_avg_metrics = avg_metrics.to_numpy().T
- fig_name = "precision_recall_{}.pdf".format(model.name)
+ fig_name = "precision_recall.pdf".format(model.name)
logger.info("saving {}".format(fig_name))
fig = precision_recall_f1iso([np_avg_metrics[0]],[np_avg_metrics[1]], np_avg_metrics[-1])
fig_filename = os.path.join(results_subfolder, fig_name)
@@ -186,7 +186,7 @@ def do_inference(
logger.info("Average batch inference time: {:.5f}s".format(average_batch_inference_time))
- times_file = "Times_{}.txt".format(model.name)
+ times_file = "Times.txt".format(model.name)
logger.info("saving {}".format(times_file))
with open (os.path.join(results_subfolder,times_file), "w+") as outfile:
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 484c36ae..b85fcc20 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -27,7 +27,6 @@ requirements:
- setuptools {{ setuptools }}
- torchvision {{ torchvision }}
- pytorch {{ pytorch }}
- - cudatoolkit=8.0
- numpy {{ numpy }}
- bob.extension
# place your other host dependencies here
@@ -55,8 +54,8 @@ test:
- {{ name }}
commands:
# test commands ("script" entry-points) from your package here
- #- bob binseg --help
- #- bob binseg train --help
+ - bob binseg --help
+ - bob binseg train --help
- nosetests --with-coverage --cover-package={{ name }} -sv {{ name }}
- sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx
- sphinx-build -aEb doctest {{ project_dir }}/doc sphinx
--
GitLab