spec lib and exe installation moved to src folder from python_wrapper…

… folder

.github/workflows/build_cmake.yml

@@ -17,7 +17,7 @@ jobs:
       - name: compile_xspec
         run: |
           pip3 install ninja cmake
-          mkdir -p ${{ github.workspace }}/build ${{ github.workspace }}/install
+          cp ${SPEC_PATH}/cmake_machines/centos_default.json ${SPEC_PATH}/cmake_config.json
           cd ${{ github.workspace }}/build
           cmake -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_Fortran_COMPILER=mpifort -DBLA_VENDOR=OpenBLAS -DHDF5_ROOT=/usr -DHDF5_NO_FIND_PACKAGE_CONFIG_FILE=TRUE -DHDF5_PREFER_PARALLEL=TRUE .. -GNinja --prefix=${SPEC_PATH}/install
           cmake --build .
@@ -26,30 +26,30 @@ jobs:
         run: |
           cd ${SPEC_PATH}/ci/G1V03L2Fi
           echo ${PYTHONPATH}
-          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/bin/xspec G1V03L2Fi.001.sp
+          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/install/bin/xspec G1V03L2Fi.001.sp
           python3 -m py_spec.ci.test compare.h5 G1V03L2Fi.001.sp.h5 
       - name: run_fast_cylinder
         run: |
           cd ${SPEC_PATH}/ci/G2V32L1Fi
           echo ${PYTHONPATH}
-          mpiexec -n 2 --allow-run-as-root ${SPEC_PATH}/bin/xspec G2V32L1Fi.001.sp
+          mpiexec -n 2 --allow-run-as-root ${SPEC_PATH}/install/bin/xspec G2V32L1Fi.001.sp
           python3 -m py_spec.ci.test compare.h5 G2V32L1Fi.001.sp.h5 
       - name: toroidal_freeboundary_vacuum
         run: |
           cd ${SPEC_PATH}/ci/toroidal_freeboundary_vacuum
-          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/bin/xspec G3V02L0Fr_LU.sp 
+          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/install/bin/xspec G3V02L0Fr_LU.sp 
           mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/xspec G3V02L0Fr.sp 
           python3 -m py_spec.ci.test compare.h5 G3V02L0Fr_LU.sp.h5 --tol 1e-11
           python3 -m py_spec.ci.test compare.h5 G3V02L0Fr.sp.h5 --tol 1e-11
       - name: current_constraint_fixed_boundary
         run: |
           cd ${SPEC_PATH}/ci/G3V08L3Fi
-          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/bin/xspec G3V08L3Fi.001.sp
+          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/install/bin/xspec G3V08L3Fi.001.sp
           python3 -m py_spec.ci.test compare.h5 G3V08L3Fi.001.sp.h5 --tol 1e-10
       - name: current_constraint_free_boundary
         run: |
           cd ${SPEC_PATH}/ci/G3V08L3Fr
-          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/bin/xspec G3V08L3Fr.001.sp
+          mpiexec -n 3 --allow-run-as-root ${SPEC_PATH}/install/bin/xspec G3V08L3Fr.001.sp
           python3 -m py_spec.ci.test compare.h5 G3V08L3Fr.001.sp.h5 --tol 1e-10
 
 

Utilities/python_wrapper/CMakeLists.txt

@@ -134,9 +134,3 @@ FILE(WRITE ${PYINIT_FILE} ${PYINIT_STR})
 install(FILES ${python_mod_file} ${generated_module_file} ${PYINIT_FILE}
         DESTINATION Utilities/python_wrapper/spec  # Here spec is directory location
 )
-install(TARGETS xspec spec)
-#        LIBRARY DESTINATION ${CMAKE_INSTALL_DIR}/.
-#        RUNTIME DESTINATION bin
-#)
-
-

build/README.md

@@ -0,0 +1 @@
+This is a placefolder folder for cmake build in Github Actions till I figure out how to create the folder in Github Actions CI

install/README.md

@@ -0,0 +1 @@
+This is a placefolder folder for cmake build in Github Actions till I figure out how to create the folder in Github Actions CI

src/CMakeLists.txt

@@ -227,3 +227,5 @@ if(SKBUILD)
     #message(STATUS "spec linked libraries are ${SPEC_LINK_LIB}")
     set(SPEC_LINK_LIB ${SPEC_LINK_LIB} PARENT_SCOPE)
 endif()
+
+install(TARGETS xspec spec)