Skip to content

Commit 1c30d1c

Browse files
fwyzardfwyzard
committed
Fix dependencies in the test BuildFiles
1 parent adc5096 commit 1c30d1c

File tree

1 file changed

+96
-90
lines changed

1 file changed

+96
-90
lines changed

‎PhysicsTools/TensorFlow/test/BuildFile.xml‎

Lines changed: 96 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,45 @@
77

88
<iftool name="cuda">
99
<bin name="testTFHelloWorldCUDA" file="testRunner.cpp,testHelloWorldCUDA.cc">
10-
<use name="tensorflow-cc"/>
1110
<use name="boost_filesystem"/>
12-
<use name="cppunit"/>
13-
<use name="PhysicsTools/TensorFlow"/>
14-
<use name="HeterogeneousCore/CUDAServices"/>
15-
<use name="HeterogeneousCore/CUDAUtilities"/>
1611
<use name="catch2"/>
12+
<use name="cppunit"/>
13+
<use name="cuda"/>
14+
<use name="tensorflow-cc"/>
1715
<use name="FWCore/ParameterSet"/>
1816
<use name="FWCore/ParameterSetReader"/>
1917
<use name="FWCore/PluginManager"/>
2018
<use name="FWCore/ServiceRegistry"/>
2119
<use name="FWCore/Utilities"/>
22-
<use name="cuda"/>
20+
<use name="HeterogeneousCore/CUDAServices"/>
21+
<use name="HeterogeneousCore/CUDAUtilities"/>
22+
<use name="HeterogeneousCore/CUDAUtilities"/>
23+
<use name="PhysicsTools/TensorFlow"/>
2324
</bin>
2425
</iftool>
2526

26-
2727
<bin name="testTFMetaGraphLoading" file="testRunner.cpp,testMetaGraphLoading.cc">
2828
<use name="boost_filesystem"/>
2929
<use name="cppunit"/>
3030
<use name="PhysicsTools/TensorFlow"/>
3131
</bin>
3232

3333
<iftool name="cuda">
34-
<bin name="testTFMetaGraphLoadingCUDA" file="testRunner.cpp,testMetaGraphLoadingCUDA.cc">
35-
<use name="boost_filesystem"/>
36-
<use name="cppunit"/>
37-
<use name="PhysicsTools/TensorFlow"/>
38-
<use name="HeterogeneousCore/CUDAServices"/>
39-
<use name="HeterogeneousCore/CUDAUtilities"/>
40-
<use name="catch2"/>
41-
<use name="FWCore/ParameterSet"/>
42-
<use name="FWCore/ParameterSetReader"/>
43-
<use name="FWCore/PluginManager"/>
44-
<use name="FWCore/ServiceRegistry"/>
45-
<use name="FWCore/Utilities"/>
46-
<use name="cuda"/>
47-
</bin>
34+
<bin name="testTFMetaGraphLoadingCUDA" file="testRunner.cpp,testMetaGraphLoadingCUDA.cc">
35+
<use name="boost_filesystem"/>
36+
<use name="catch2"/>
37+
<use name="cppunit"/>
38+
<use name="cuda"/>
39+
<use name="FWCore/ParameterSet"/>
40+
<use name="FWCore/ParameterSetReader"/>
41+
<use name="FWCore/PluginManager"/>
42+
<use name="FWCore/ServiceRegistry"/>
43+
<use name="FWCore/Utilities"/>
44+
<use name="HeterogeneousCore/CUDAServices"/>
45+
<use name="HeterogeneousCore/CUDAUtilities"/>
46+
<use name="HeterogeneousCore/CUDAUtilities"/>
47+
<use name="PhysicsTools/TensorFlow"/>
48+
</bin>
4849
</iftool>
4950

5051
<bin name="testTFGraphLoading" file="testRunner.cpp,testGraphLoading.cc">
@@ -54,20 +55,21 @@
5455
</bin>
5556

5657
<iftool name="cuda">
57-
<bin name="testTFGraphLoadingCUDA" file="testRunner.cpp,testGraphLoadingCUDA.cc">
58-
<use name="boost_filesystem"/>
59-
<use name="cppunit"/>
60-
<use name="PhysicsTools/TensorFlow"/>
61-
<use name="HeterogeneousCore/CUDAServices"/>
62-
<use name="HeterogeneousCore/CUDAUtilities"/>
63-
<use name="catch2"/>
64-
<use name="FWCore/ParameterSet"/>
65-
<use name="FWCore/ParameterSetReader"/>
66-
<use name="FWCore/PluginManager"/>
67-
<use name="FWCore/ServiceRegistry"/>
68-
<use name="FWCore/Utilities"/>
69-
<use name="cuda"/>
70-
</bin>
58+
<bin name="testTFGraphLoadingCUDA" file="testRunner.cpp,testGraphLoadingCUDA.cc">
59+
<use name="boost_filesystem"/>
60+
<use name="catch2"/>
61+
<use name="cppunit"/>
62+
<use name="cuda"/>
63+
<use name="FWCore/ParameterSet"/>
64+
<use name="FWCore/ParameterSetReader"/>
65+
<use name="FWCore/PluginManager"/>
66+
<use name="FWCore/ServiceRegistry"/>
67+
<use name="FWCore/Utilities"/>
68+
<use name="HeterogeneousCore/CUDAServices"/>
69+
<use name="HeterogeneousCore/CUDAUtilities"/>
70+
<use name="HeterogeneousCore/CUDAUtilities"/>
71+
<use name="PhysicsTools/TensorFlow"/>
72+
</bin>
7173
</iftool>
7274

7375
<bin name="testTFConstSession" file="testRunner.cpp,testConstSession.cc">
@@ -77,20 +79,21 @@
7779
</bin>
7880

7981
<iftool name="cuda">
80-
<bin name="testTFConstSessionCUDA" file="testRunner.cpp,testConstSessionCUDA.cc">
81-
<use name="boost_filesystem"/>
82-
<use name="cppunit"/>
83-
<use name="PhysicsTools/TensorFlow"/>
84-
<use name="HeterogeneousCore/CUDAServices"/>
85-
<use name="HeterogeneousCore/CUDAUtilities"/>
86-
<use name="catch2"/>
87-
<use name="FWCore/ParameterSet"/>
88-
<use name="FWCore/ParameterSetReader"/>
89-
<use name="FWCore/PluginManager"/>
90-
<use name="FWCore/ServiceRegistry"/>
91-
<use name="FWCore/Utilities"/>
92-
<use name="cuda"/>
93-
</bin>
82+
<bin name="testTFConstSessionCUDA" file="testRunner.cpp,testConstSessionCUDA.cc">
83+
<use name="boost_filesystem"/>
84+
<use name="catch2"/>
85+
<use name="cppunit"/>
86+
<use name="cuda"/>
87+
<use name="FWCore/ParameterSet"/>
88+
<use name="FWCore/ParameterSetReader"/>
89+
<use name="FWCore/PluginManager"/>
90+
<use name="FWCore/ServiceRegistry"/>
91+
<use name="FWCore/Utilities"/>
92+
<use name="HeterogeneousCore/CUDAServices"/>
93+
<use name="HeterogeneousCore/CUDAUtilities"/>
94+
<use name="HeterogeneousCore/CUDAUtilities"/>
95+
<use name="PhysicsTools/TensorFlow"/>
96+
</bin>
9497
</iftool>
9598

9699
<bin name="testTFSessionCache" file="testRunner.cpp,testSessionCache.cc">
@@ -100,20 +103,21 @@
100103
</bin>
101104

102105
<iftool name="cuda">
103-
<bin name="testTFSessionCacheCUDA" file="testRunner.cpp,testSessionCacheCUDA.cc">
104-
<use name="boost_filesystem"/>
105-
<use name="cppunit"/>
106-
<use name="PhysicsTools/TensorFlow"/>
107-
<use name="HeterogeneousCore/CUDAServices"/>
108-
<use name="HeterogeneousCore/CUDAUtilities"/>
109-
<use name="catch2"/>
110-
<use name="FWCore/ParameterSet"/>
111-
<use name="FWCore/ParameterSetReader"/>
112-
<use name="FWCore/PluginManager"/>
113-
<use name="FWCore/ServiceRegistry"/>
114-
<use name="FWCore/Utilities"/>
115-
<use name="cuda"/>
116-
</bin>
106+
<bin name="testTFSessionCacheCUDA" file="testRunner.cpp,testSessionCacheCUDA.cc">
107+
<use name="boost_filesystem"/>
108+
<use name="catch2"/>
109+
<use name="cppunit"/>
110+
<use name="cuda"/>
111+
<use name="FWCore/ParameterSet"/>
112+
<use name="FWCore/ParameterSetReader"/>
113+
<use name="FWCore/PluginManager"/>
114+
<use name="FWCore/ServiceRegistry"/>
115+
<use name="FWCore/Utilities"/>
116+
<use name="HeterogeneousCore/CUDAServices"/>
117+
<use name="HeterogeneousCore/CUDAUtilities"/>
118+
<use name="HeterogeneousCore/CUDAUtilities"/>
119+
<use name="PhysicsTools/TensorFlow"/>
120+
</bin>
117121
</iftool>
118122

119123
<bin name="testTFThreadPools" file="testRunner.cpp,testThreadPools.cc">
@@ -123,20 +127,21 @@
123127
</bin>
124128

125129
<iftool name="cuda">
126-
<bin name="testTFThreadPoolsCUDA" file="testRunner.cpp,testThreadPoolsCUDA.cc">
127-
<use name="boost_filesystem"/>
128-
<use name="cppunit"/>
129-
<use name="PhysicsTools/TensorFlow"/>
130-
<use name="HeterogeneousCore/CUDAServices"/>
131-
<use name="HeterogeneousCore/CUDAUtilities"/>
132-
<use name="catch2"/>
133-
<use name="FWCore/ParameterSet"/>
134-
<use name="FWCore/ParameterSetReader"/>
135-
<use name="FWCore/PluginManager"/>
136-
<use name="FWCore/ServiceRegistry"/>
137-
<use name="FWCore/Utilities"/>
138-
<use name="cuda"/>
139-
</bin>
130+
<bin name="testTFThreadPoolsCUDA" file="testRunner.cpp,testThreadPoolsCUDA.cc">
131+
<use name="boost_filesystem"/>
132+
<use name="catch2"/>
133+
<use name="cppunit"/>
134+
<use name="cuda"/>
135+
<use name="FWCore/ParameterSet"/>
136+
<use name="FWCore/ParameterSetReader"/>
137+
<use name="FWCore/PluginManager"/>
138+
<use name="FWCore/ServiceRegistry"/>
139+
<use name="FWCore/Utilities"/>
140+
<use name="HeterogeneousCore/CUDAServices"/>
141+
<use name="HeterogeneousCore/CUDAUtilities"/>
142+
<use name="HeterogeneousCore/CUDAUtilities"/>
143+
<use name="PhysicsTools/TensorFlow"/>
144+
</bin>
140145
</iftool>
141146

142147
<bin name="testTFVisibleDevices" file="testRunner.cpp,testVisibleDevices.cc">
@@ -147,19 +152,20 @@
147152

148153

149154
<iftool name="cuda">
150-
<bin name="testTFVisibleDevicesCUDA" file="testRunner.cpp,testVisibleDevicesCUDA.cc">
151-
<use name="boost_filesystem"/>
152-
<use name="cppunit"/>
153-
<use name="PhysicsTools/TensorFlow"/>
154-
<use name="HeterogeneousCore/CUDAServices"/>
155-
<use name="catch2"/>
156-
<use name="FWCore/ParameterSet"/>
157-
<use name="FWCore/ParameterSetReader"/>
158-
<use name="FWCore/PluginManager"/>
159-
<use name="FWCore/ServiceRegistry"/>
160-
<use name="FWCore/Utilities"/>
161-
<use name="cuda"/>
162-
</bin>
155+
<bin name="testTFVisibleDevicesCUDA" file="testRunner.cpp,testVisibleDevicesCUDA.cc">
156+
<use name="boost_filesystem"/>
157+
<use name="catch2"/>
158+
<use name="cppunit"/>
159+
<use name="cuda"/>
160+
<use name="FWCore/ParameterSet"/>
161+
<use name="FWCore/ParameterSetReader"/>
162+
<use name="FWCore/PluginManager"/>
163+
<use name="FWCore/ServiceRegistry"/>
164+
<use name="FWCore/Utilities"/>
165+
<use name="HeterogeneousCore/CUDAServices"/>
166+
<use name="HeterogeneousCore/CUDAUtilities"/>
167+
<use name="PhysicsTools/TensorFlow"/>
168+
</bin>
163169
</iftool>
164170

165171
<!-- <ifarchitecture name="!_ppc64le_">

0 commit comments

Comments
 (0)