Misc fixes for various build/test environments

Signed-off-by: Ben Howe <[email protected]>

Author: bmhowe23

Building.md

@@ -40,12 +40,14 @@ git clone https://github.com/NVIDIA/cudaqx.git
 cd cudaqx
 mkdir build && cd build
 
-# Configure your build (adjust as necessary)
+# Configure your build (adjust as necessary). Note TRT requires extra
+# dependencies, so the command below disables it from the build.
 cmake -G Ninja -S .. \
   -DCUDAQ_INSTALL_DIR=$CUDAQ_INSTALL_PREFIX \
   -DCMAKE_INSTALL_PREFIX=${CUDAQX_INSTALL_PREFIX} \
   -DCUDAQ_DIR=${CUDAQ_INSTALL_PREFIX}/lib/cmake/cudaq \
   -DCMAKE_BUILD_TYPE=Release
+  -DCUDAQ_QEC_BUILD_TRT_DECODER=OFF
 
 # Install your build
 ninja install
@@ -55,7 +57,7 @@ export PYTHONPATH=${CUDAQ_INSTALL_PREFIX}:${CUDAQX_INSTALL_PREFIX}
 export PATH="${CUDAQ_INSTALL_PREFIX}/bin:${CUDAQX_INSTALL_PREFIX}/bin:${PATH}"
 ctest
 # Run the python tests
-# The --ignore option is to bypass tests that require additional packages not contained in 
+# The --ignore option is to bypass tests that require additional packages not contained in
 # the standard docker container
 cd ..
 python3 -m pytest -v libs/qec/python/tests --ignore libs/qec/python/tests/test_tensor_network_decoder.py

libs/qec/CMakeLists.txt

@@ -61,6 +61,9 @@ option(CUDAQX_QEC_INSTALL_PYTHON
        "Install python files alongside the library."
        ${CUDAQX_INSTALL_PYTHON})
 
+# Option to control TRT decoder build (default: ON)
+option(CUDAQ_QEC_BUILD_TRT_DECODER "Build the TensorRT decoder plugin" ON)
+
 # Check for CUDA Support (ref: cuda-quantum/CMakeLists.txt)
 # ==============================================================================
 include(CheckLanguage)

libs/qec/lib/CMakeLists.txt

@@ -25,7 +25,11 @@ add_library(${LIBRARY_NAME} SHARED
 )
 
 add_subdirectory(decoders/plugins/example)
-add_subdirectory(decoders/plugins/trt_decoder)
+
+if(CUDAQ_QEC_BUILD_TRT_DECODER)
+  add_subdirectory(decoders/plugins/trt_decoder)
+endif()
+
 add_subdirectory(codes)
 add_subdirectory(device) 
 

libs/qec/unittests/CMakeLists.txt

@@ -44,7 +44,7 @@ add_dependencies(CUDAQXQECUnitTests test_qec)
 gtest_discover_tests(test_qec)
 
 # TensorRT decoder test is only built for x86 architectures
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
+if(CUDAQ_QEC_BUILD_TRT_DECODER AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
   add_executable(test_trt_decoder ./decoders/trt_decoder/test_trt_decoder.cpp)
 
   # Find TensorRT for the test

libs/solvers/python/tests/test_uccgsd.py

@@ -6,6 +6,22 @@
 import cudaq
 import cudaq_solvers as solvers
 from scipy.optimize import minimize
+import subprocess
+
+
+def is_nvidia_gpu_available():
+    """Check if NVIDIA GPU is available using nvidia-smi command."""
+    try:
+        result = subprocess.run(["nvidia-smi"],
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                text=True)
+        if result.returncode == 0 and "GPU" in result.stdout:
+            return True
+    except FileNotFoundError:
+        # The nvidia-smi command is not found, indicating no NVIDIA GPU drivers
+        return False
+    return False
 
 
 def test_solvers_adapt_uccgsd_h2():
@@ -138,6 +154,9 @@ def cost(theta):
     assert np.isclose(energy, -1.1371, atol=1e-4)
 
 
+# Since this test is so slow on the CPU, only run this test if a GPU was found.
+@pytest.mark.skipif(not is_nvidia_gpu_available(),
+                    reason="NVIDIA GPU not found")
 def test_solvers_vqe_uccgsd_lih():
 
     geometry = [('Li', (0.3925, 0., 0.)), ('H', (-1.1774, 0., .0))]

libs/solvers/unittests/test_uccgsd_operator_pool.cpp

@@ -187,8 +187,9 @@ TEST(UCCGSDOperatorPoolTest, AllOperatorsNonEmpty) {
   for (size_t i = 0; i < ops.size(); ++i) {
     EXPECT_GT(ops[i].num_terms(), 0)
         << "Operator " << i << " is empty (has 0 terms)";
-    EXPECT_FALSE(ops[i].is_identity())
-        << "Operator " << i << " should not be identity";
+    for (const auto &term : ops[i])
+      EXPECT_FALSE(term.is_identity())
+          << "Term " << term.to_string() << " is identity";
   }
 }