diff --git a/PhysicsTools/TensorFlow/test/BuildFile.xml b/PhysicsTools/TensorFlow/test/BuildFile.xml
index 03ca557c61619..ad81ff7a9ebe9 100644
--- a/PhysicsTools/TensorFlow/test/BuildFile.xml
+++ b/PhysicsTools/TensorFlow/test/BuildFile.xml
@@ -5,23 +5,23 @@
   <use name="PhysicsTools/TensorFlow"/>
 </bin>
 
-<iftool name="cuda">
-  <bin name="testTFHelloWorldCUDA" file="testRunner.cpp,testHelloWorldCUDA.cc">
-    <use name="boost_filesystem"/>
-    <use name="catch2"/>
-    <use name="cppunit"/>
-    <use name="cuda"/>
-    <use name="tensorflow-cc"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/PluginManager"/>
-    <use name="FWCore/ServiceRegistry"/>
-    <use name="FWCore/Utilities"/>
-    <use name="HeterogeneousCore/CUDAServices"/>
-    <use name="HeterogeneousCore/CUDAUtilities"/>
-    <use name="PhysicsTools/TensorFlow"/>
-  </bin>
-</iftool>
+<!-- <iftool name="cuda"> -->
+<!--   <bin name="testTFHelloWorldCUDA" file="testRunner.cpp,testHelloWorldCUDA.cc"> -->
+<!--     <use name="boost_filesystem"/> -->
+<!--     <use name="catch2"/> -->
+<!--     <use name="cppunit"/> -->
+<!--     <use name="cuda"/> -->
+<!--     <use name="tensorflow-cc"/> -->
+<!--     <use name="FWCore/ParameterSet"/> -->
+<!--     <use name="FWCore/ParameterSetReader"/> -->
+<!--     <use name="FWCore/PluginManager"/> -->
+<!--     <use name="FWCore/ServiceRegistry"/> -->
+<!--     <use name="FWCore/Utilities"/> -->
+<!--     <use name="HeterogeneousCore/CUDAServices"/> -->
+<!--     <use name="HeterogeneousCore/CUDAUtilities"/> -->
+<!--     <use name="PhysicsTools/TensorFlow"/> -->
+<!--   </bin> -->
+<!-- </iftool> -->
 
 <bin name="testTFMetaGraphLoading" file="testRunner.cpp,testMetaGraphLoading.cc">
   <use name="boost_filesystem"/>
@@ -29,22 +29,22 @@
   <use name="PhysicsTools/TensorFlow"/>
 </bin>
 
-<iftool name="cuda">
-  <bin name="testTFMetaGraphLoadingCUDA" file="testRunner.cpp,testMetaGraphLoadingCUDA.cc">
-    <use name="boost_filesystem"/>
-    <use name="catch2"/>
-    <use name="cppunit"/>
-    <use name="cuda"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/PluginManager"/>
-    <use name="FWCore/ServiceRegistry"/>
-    <use name="FWCore/Utilities"/>
-    <use name="HeterogeneousCore/CUDAServices"/>
-    <use name="HeterogeneousCore/CUDAUtilities"/>
-    <use name="PhysicsTools/TensorFlow"/>
-  </bin>
-</iftool>
+<!-- <iftool name="cuda"> -->
+<!--   <bin name="testTFMetaGraphLoadingCUDA" file="testRunner.cpp,testMetaGraphLoadingCUDA.cc"> -->
+<!--     <use name="boost_filesystem"/> -->
+<!--     <use name="catch2"/> -->
+<!--     <use name="cppunit"/> -->
+<!--     <use name="cuda"/> -->
+<!--     <use name="FWCore/ParameterSet"/> -->
+<!--     <use name="FWCore/ParameterSetReader"/> -->
+<!--     <use name="FWCore/PluginManager"/> -->
+<!--     <use name="FWCore/ServiceRegistry"/> -->
+<!--     <use name="FWCore/Utilities"/> -->
+<!--     <use name="HeterogeneousCore/CUDAServices"/> -->
+<!--     <use name="HeterogeneousCore/CUDAUtilities"/> -->
+<!--     <use name="PhysicsTools/TensorFlow"/> -->
+<!--   </bin> -->
+<!-- </iftool> -->
 
 <bin name="testTFGraphLoading" file="testRunner.cpp,testGraphLoading.cc">
   <use name="boost_filesystem"/>
@@ -52,22 +52,22 @@
   <use name="PhysicsTools/TensorFlow"/>
 </bin>
 
-<iftool name="cuda">
-  <bin name="testTFGraphLoadingCUDA" file="testRunner.cpp,testGraphLoadingCUDA.cc">
-    <use name="boost_filesystem"/>
-    <use name="catch2"/>
-    <use name="cppunit"/>
-    <use name="cuda"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/PluginManager"/>
-    <use name="FWCore/ServiceRegistry"/>
-    <use name="FWCore/Utilities"/>
-    <use name="HeterogeneousCore/CUDAServices"/>
-    <use name="HeterogeneousCore/CUDAUtilities"/>
-    <use name="PhysicsTools/TensorFlow"/>
-  </bin>
-</iftool>
+<!-- <iftool name="cuda"> -->
+<!--   <bin name="testTFGraphLoadingCUDA" file="testRunner.cpp,testGraphLoadingCUDA.cc"> -->
+<!--     <use name="boost_filesystem"/> -->
+<!--     <use name="catch2"/> -->
+<!--     <use name="cppunit"/> -->
+<!--     <use name="cuda"/> -->
+<!--     <use name="FWCore/ParameterSet"/> -->
+<!--     <use name="FWCore/ParameterSetReader"/> -->
+<!--     <use name="FWCore/PluginManager"/> -->
+<!--     <use name="FWCore/ServiceRegistry"/> -->
+<!--     <use name="FWCore/Utilities"/> -->
+<!--     <use name="HeterogeneousCore/CUDAServices"/> -->
+<!--     <use name="HeterogeneousCore/CUDAUtilities"/> -->
+<!--     <use name="PhysicsTools/TensorFlow"/> -->
+<!--   </bin> -->
+<!-- </iftool> -->
 
 <bin name="testTFConstSession" file="testRunner.cpp,testConstSession.cc">
   <use name="boost_filesystem"/>
@@ -75,22 +75,22 @@
   <use name="PhysicsTools/TensorFlow"/>
 </bin>
 
-<iftool name="cuda">
-  <bin name="testTFConstSessionCUDA" file="testRunner.cpp,testConstSessionCUDA.cc">
-    <use name="boost_filesystem"/>
-    <use name="catch2"/>
-    <use name="cppunit"/>
-    <use name="cuda"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/PluginManager"/>
-    <use name="FWCore/ServiceRegistry"/>
-    <use name="FWCore/Utilities"/>
-    <use name="HeterogeneousCore/CUDAServices"/>
-    <use name="HeterogeneousCore/CUDAUtilities"/>
-    <use name="PhysicsTools/TensorFlow"/>
-  </bin>
-</iftool>
+<!-- <iftool name="cuda"> -->
+<!--   <bin name="testTFConstSessionCUDA" file="testRunner.cpp,testConstSessionCUDA.cc"> -->
+<!--     <use name="boost_filesystem"/> -->
+<!--     <use name="catch2"/> -->
+<!--     <use name="cppunit"/> -->
+<!--     <use name="cuda"/> -->
+<!--     <use name="FWCore/ParameterSet"/> -->
+<!--     <use name="FWCore/ParameterSetReader"/> -->
+<!--     <use name="FWCore/PluginManager"/> -->
+<!--     <use name="FWCore/ServiceRegistry"/> -->
+<!--     <use name="FWCore/Utilities"/> -->
+<!--     <use name="HeterogeneousCore/CUDAServices"/> -->
+<!--     <use name="HeterogeneousCore/CUDAUtilities"/> -->
+<!--     <use name="PhysicsTools/TensorFlow"/> -->
+<!--   </bin> -->
+<!-- </iftool> -->
 
 <bin name="testTFSessionCache" file="testRunner.cpp,testSessionCache.cc">
   <use name="boost_filesystem"/>
@@ -98,22 +98,22 @@
   <use name="PhysicsTools/TensorFlow"/>
 </bin>
 
-<iftool name="cuda">
-  <bin name="testTFSessionCacheCUDA" file="testRunner.cpp,testSessionCacheCUDA.cc">
-    <use name="boost_filesystem"/>
-    <use name="catch2"/>
-    <use name="cppunit"/>
-    <use name="cuda"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/PluginManager"/>
-    <use name="FWCore/ServiceRegistry"/>
-    <use name="FWCore/Utilities"/>
-    <use name="HeterogeneousCore/CUDAServices"/>
-    <use name="HeterogeneousCore/CUDAUtilities"/>
-    <use name="PhysicsTools/TensorFlow"/>
-  </bin>
-</iftool>
+<!-- <iftool name="cuda"> -->
+<!--   <bin name="testTFSessionCacheCUDA" file="testRunner.cpp,testSessionCacheCUDA.cc"> -->
+<!--     <use name="boost_filesystem"/> -->
+<!--     <use name="catch2"/> -->
+<!--     <use name="cppunit"/> -->
+<!--     <use name="cuda"/> -->
+<!--     <use name="FWCore/ParameterSet"/> -->
+<!--     <use name="FWCore/ParameterSetReader"/> -->
+<!--     <use name="FWCore/PluginManager"/> -->
+<!--     <use name="FWCore/ServiceRegistry"/> -->
+<!--     <use name="FWCore/Utilities"/> -->
+<!--     <use name="HeterogeneousCore/CUDAServices"/> -->
+<!--     <use name="HeterogeneousCore/CUDAUtilities"/> -->
+<!--     <use name="PhysicsTools/TensorFlow"/> -->
+<!--   </bin> -->
+<!-- </iftool> -->
 
 <bin name="testTFThreadPools" file="testRunner.cpp,testThreadPools.cc">
   <use name="boost_filesystem"/>
@@ -121,22 +121,22 @@
   <use name="PhysicsTools/TensorFlow"/>
 </bin>
 
-<iftool name="cuda">
-  <bin name="testTFThreadPoolsCUDA" file="testRunner.cpp,testThreadPoolsCUDA.cc">
-    <use name="boost_filesystem"/>
-    <use name="catch2"/>
-    <use name="cppunit"/>
-    <use name="cuda"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/PluginManager"/>
-    <use name="FWCore/ServiceRegistry"/>
-    <use name="FWCore/Utilities"/>
-    <use name="HeterogeneousCore/CUDAServices"/>
-    <use name="HeterogeneousCore/CUDAUtilities"/>
-    <use name="PhysicsTools/TensorFlow"/>
-  </bin>
-</iftool>
+<!-- <iftool name="cuda"> -->
+<!--   <bin name="testTFThreadPoolsCUDA" file="testRunner.cpp,testThreadPoolsCUDA.cc"> -->
+<!--     <use name="boost_filesystem"/> -->
+<!--     <use name="catch2"/> -->
+<!--     <use name="cppunit"/> -->
+<!--     <use name="cuda"/> -->
+<!--     <use name="FWCore/ParameterSet"/> -->
+<!--     <use name="FWCore/ParameterSetReader"/> -->
+<!--     <use name="FWCore/PluginManager"/> -->
+<!--     <use name="FWCore/ServiceRegistry"/> -->
+<!--     <use name="FWCore/Utilities"/> -->
+<!--     <use name="HeterogeneousCore/CUDAServices"/> -->
+<!--     <use name="HeterogeneousCore/CUDAUtilities"/> -->
+<!--     <use name="PhysicsTools/TensorFlow"/> -->
+<!--   </bin> -->
+<!-- </iftool> -->
 
 <bin name="testTFVisibleDevices" file="testRunner.cpp,testVisibleDevices.cc">
   <use name="boost_filesystem"/>
@@ -145,22 +145,22 @@
 </bin>
 
 
-<iftool name="cuda">
-  <bin name="testTFVisibleDevicesCUDA" file="testRunner.cpp,testVisibleDevicesCUDA.cc">
-    <use name="boost_filesystem"/>
-    <use name="catch2"/>
-    <use name="cppunit"/>
-    <use name="cuda"/>
-    <use name="FWCore/ParameterSet"/>
-    <use name="FWCore/ParameterSetReader"/>
-    <use name="FWCore/PluginManager"/>
-    <use name="FWCore/ServiceRegistry"/>
-    <use name="FWCore/Utilities"/>
-    <use name="HeterogeneousCore/CUDAServices"/>
-    <use name="HeterogeneousCore/CUDAUtilities"/>
-    <use name="PhysicsTools/TensorFlow"/>
-  </bin>
-</iftool>
+<!-- <iftool name="cuda"> -->
+<!--   <bin name="testTFVisibleDevicesCUDA" file="testRunner.cpp,testVisibleDevicesCUDA.cc"> -->
+<!--     <use name="boost_filesystem"/> -->
+<!--     <use name="catch2"/> -->
+<!--     <use name="cppunit"/> -->
+<!--     <use name="cuda"/> -->
+<!--     <use name="FWCore/ParameterSet"/> -->
+<!--     <use name="FWCore/ParameterSetReader"/> -->
+<!--     <use name="FWCore/PluginManager"/> -->
+<!--     <use name="FWCore/ServiceRegistry"/> -->
+<!--     <use name="FWCore/Utilities"/> -->
+<!--     <use name="HeterogeneousCore/CUDAServices"/> -->
+<!--     <use name="HeterogeneousCore/CUDAUtilities"/> -->
+<!--     <use name="PhysicsTools/TensorFlow"/> -->
+<!--   </bin> -->
+<!-- </iftool> -->
 
 <!-- <ifarchitecture name="!_ppc64le_">
 <bin name="testTFAOT" file="testRunner.cpp,testAOT.cc">