88f740ba6c
Drop patches previously backported: root-doxygen-makefile.patch root-crash-fix.patch root-test-stress-32bit.patch Drop patches accepted upstream: root-test-subdirs.patch root-test-fixes.patch root-out-of-bounds.patch root-doxygen-tilde.patch root-noinst.patch Drop patches for issues fixed upstream: root-dont-link-jvm.patch root-system-pythia.patch Drop patch root-urw-otf-hack.patch - broken font file no longer present Drop Google Droid Sans Fallback font from EPEL 7 root-fonts package (the font is now available in EPEL 7) Use two more patches from Fedora's llvm5.0 package New root-test-subdirs.patch patch for more instances of the same issue Fix a test not setting cache file directory so that it works offline Fix a compatibility issue with the EPEL 7 gtest version Fix a missing include Workaround optimization problems in the Geom library New subpackages due to library splits root-tree-dataframe and root-vecops from root-tree-player root-net-httpsniff from root-net-http New subpackages due to package splits root-gui-html from root-gui root-gui-qtgsi from root-gui-qt root-io-xmlparser from root-io-xml root-proof-player from root-proof New ROOT 7 subpackages graf-gpadv7 graf-primitives gui-fitpanelv7 gui-qt5webdisplay Rename root-guibuilder package to root-gui-builder
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From e8778178329efc8e04ea35643259cfc6ec2f9b51 Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Tue, 26 Jun 2018 11:11:48 +0200
|
|
Subject: [PATCH] Set cache file dir when using CACHEREAD option Remove
|
|
unnecessary CACHEREAD for local file
|
|
|
|
---
|
|
tmva/tmva/test/DNN/CNN/TestMethodDL.h | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tmva/tmva/test/DNN/CNN/TestMethodDL.h b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
|
|
index 1cac008458e..904fb54cd97 100644
|
|
--- a/tmva/tmva/test/DNN/CNN/TestMethodDL.h
|
|
+++ b/tmva/tmva/test/DNN/CNN/TestMethodDL.h
|
|
@@ -49,14 +49,12 @@ void testMethodDL_CNN(TString architectureStr)
|
|
// Load the input data
|
|
|
|
TString fname = "imagesData.root";
|
|
- TString fopt = "CACHEREAD";
|
|
- //auto input = TFile::Open(fname,fopt);
|
|
|
|
// generate the files
|
|
// 1000 for testing 1000 for training
|
|
makeImages(2000);
|
|
|
|
- auto input = TFile::Open(fname,fopt);
|
|
+ auto input = TFile::Open(fname);
|
|
|
|
R__ASSERT(input);
|
|
|
|
@@ -174,6 +172,7 @@ void testMethodDL_DNN(TString architectureStr)
|
|
// TString fname = "/Users/vladimirilievski/Desktop/Vladimir/GSoC/ROOT-CI/common-version/root/tmva/tmva/test/DNN/CNN/"
|
|
// "dataset/tmva_class_example.root";
|
|
TString fname = "http://root.cern.ch/files/tmva_class_example.root";
|
|
+ TFile::SetCacheFileDir(".");
|
|
TString fopt = "CACHEREAD";
|
|
input = TFile::Open(fname,fopt);
|
|
|