cmake modifications

Author: vicenley

CMakeLists.txt

@@ -53,23 +53,25 @@ option(XACC_BUILD_IONTRAP "Build the iontrap plugin" OFF)
 option(PY_ENV "Create and use a Conda Python environment" OFF)
 
 if(PY_ENV)
-  # Set the environment name to xacc
-  set(ANACONDA_ENV_NAME "xacc")
-
-  # List of required Python packages as separate arguments
-  set(PYTHON_PACKAGES "iPOPO" "qsrs" "rpcq" "qiskit" "qsearch" "scipy"  "myqlm" "scikit-quant" "qfactor" "pybind11")
-
   # Check if the environment already exists by using conda info --envs
   execute_process(
-    COMMAND conda info --envs
-    OUTPUT_VARIABLE CONDA_ENVS
+    COMMAND conda info --base
+    OUTPUT_VARIABLE CONDA_BASE_PATH
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
+  # Set the environment name to xacc
+  set(ANACONDA_ENV_NAME "xacc")
+  # Set the base path to the Conda installation
+  message(STATUS "Using Conda: ${CONDA_BASE_PATH}")
+  set(ANACONDA_ENV_PATH "${CONDA_BASE_PATH}/envs/${ANACONDA_ENV_NAME}")
+  # List of required Python packages as separate arguments
+  set(PYTHON_PACKAGES "iPOPO" "qsrs" "rpcq" "qiskit" "qsearch" "scipy"  "myqlm" "scikit-quant" "qfactor")
 
-  # Check if the xacc environment is found in the list of conda environments
-  string(REGEX MATCH "[^ \n]*${ANACONDA_ENV_NAME}[^ \n]*" ANACONDA_ENV_PATH "${CONDA_ENVS}")
 
-  if(NOT ANACONDA_ENV_PATH)
+  # Check if the xacc environment is found in the list of conda environments
+  if(EXISTS "${ANACONDA_ENV_PATH}")
+    message(STATUS "Conda environment ${ANACONDA_ENV_NAME} already exists at ${ANACONDA_ENV_PATH}")
+  else()
     # If the environment does not exist, create it
     message(STATUS "Conda environment ${ANACONDA_ENV_NAME} not found. Creating the environment.")
     execute_process(COMMAND conda create -y --name ${ANACONDA_ENV_NAME} python==3.12.4
@@ -81,17 +83,20 @@ if(PY_ENV)
 
     # After creation, update the environment path
     execute_process(
-      COMMAND conda info --envs
-      OUTPUT_VARIABLE CONDA_ENVS
+      COMMAND conda info --base
+      OUTPUT_VARIABLE CONDA_BASE_PATH
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+    set(ANACONDA_ENV_PATH "${CONDA_BASE_PATH}/envs/${ANACONDA_ENV_NAME}")
 
-    string(REGEX MATCH "[^ \n]*${ANACONDA_ENV_NAME}[^ \n]*" ANACONDA_ENV_PATH "${CONDA_ENVS}")
     message(STATUS "Conda environment ${ANACONDA_ENV_NAME} created at ${ANACONDA_ENV_PATH}")
-  else()
-    message(STATUS "Conda environment ${ANACONDA_ENV_NAME} already exists at ${ANACONDA_ENV_PATH}")
   endif()
 
+  # Set the path to Python executable directly from the conda environment
+  set(Python_EXECUTABLE "${ANACONDA_ENV_PATH}/bin/python")
+
+  message(STATUS "Using Python from Conda environment: ${Python_EXECUTABLE}${colorreset}")
+
   # Install necessary Python packages using conda run to ensure environment context
   foreach(package ${PYTHON_PACKAGES})
     message(STATUS "Checking installation of Python package: ${package}")
@@ -108,7 +113,7 @@ if(PY_ENV)
     else()
       message(STATUS "Installing Python package: ${package}")
       execute_process(
-        COMMAND conda run -n ${ANACONDA_ENV_NAME} ${Python_EXECUTABLE} pip install ${package}
+        COMMAND conda run -n ${ANACONDA_ENV_NAME} ${Python_EXECUTABLE} -m pip install ${package}
 
       #COMMAND conda run -n ${ANACONDA_ENV_NAME} ${Python_EXECUTABLE} -m pip install ${package}
         RESULT_VARIABLE PIP_INSTALL_RESULT
@@ -117,28 +122,13 @@ if(PY_ENV)
       if(NOT PIP_INSTALL_RESULT EQUAL "0")
         message(WARNING "Failed to install Python package ${package}. Continuing without it.")
       endif()
+
     endif()
   endforeach()
-  
-  execute_process(
-    COMMAND conda activate ${ANACONDA_ENV_NAME}
-  )
-
-  # Set the path to Python executable directly from the conda environment
-  set(Python_EXECUTABLE "${ANACONDA_ENV_PATH}/bin/python")
-
-  message(STATUS "Using Python from Conda environment: ${Python_EXECUTABLE}{colorreset}")
 else()
-  message(STATUS "PY_ENV is OFF, not using Conda environment.")
+  message(STATUS "Using system Python")
 endif()
 
-
-
-
-
-
-
-
 if(XACC_BUILD_ANNEALING)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DANNEALING_ENABLED")
 else()

quantum/plugins/ibm/aer/py-aer/CMakeLists.txt

@@ -1,10 +1,4 @@
 set(LIBRARY_NAME xacc-py-aer-adapter)
-# Set the python_ROOT_DIR to the root of your Anaconda environment
-
-set(Python_EXECUTABLE ${ANACONDA_ENV_PATH}/bin/python)
-set(Python_INCLUDE_DIRS ${ANACONDA_ENV_PATH}/include/python3.12)
-set(Python_LIBRARIES ${ANACONDA_ENV_PATH}/lib/libpython3.12.so)
-
 
 find_package(Python COMPONENTS Interpreter Development)