Cleanup

equinor · Mar 1, 2024 · db892ce · db892ce
1 parent 07b0ef1
commit db892ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 20 deletions.
diff --git a/dakota_manylinux_install_files/build_deps_gha.sh b/dakota_manylinux_install_files/build_deps_gha.sh
@@ -174,11 +174,3 @@ mkdir -p $DIST_BUILD
 cp -r $INSTALL_DIR/bin $DIST_BUILD
 cp -r $INSTALL_DIR/lib $DIST_BUILD
 cp -r $INSTALL_DIR/include $DIST_BUILD
-
-ls -lah $DIST_BUILD
-echo "-------------------------------"
-ls -lah $DIST_BUILD/bin
-echo "-------------------------------"
-ls -lah $DIST_BUILD/include
-echo "-------------------------------"
-ls -lah $DIST_BUILD/lib
diff --git a/dakota_manylinux_install_files/build_wheels_gha.sh b/dakota_manylinux_install_files/build_wheels_gha.sh
@@ -6,41 +6,34 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
-CAROLINA_REPO=$(pwd)
-
-DIST_BUILD=/github/workspace/dist_build
-INSTALL_DIR=$DIST_BUILD
+CAROLINA_DIR=$(pwd)
+INSTALL_DIR=/github/workspace/dist_build
 
 cd /tmp
 
 python_exec=$(which python$1)
 $python_exec -m venv myvenv
 source ./myvenv/bin/activate
 
-ls -lah $DIST_BUILD
-
 pip install pytest numpy
 NUMPY_INCLUDE_PATH=$(find /tmp -type d -path "*site-packages/numpy/core/include")
 numpy_lib_dir=$(find /tmp/myvenv/ -name numpy.libs)
-
 yum install lapack-devel -y
 
 export PATH="$PATH:$INSTALL_DIR/bin"
 export LD_LIBRARY_PATH="/usr/lib:/usr/lib64:$INSTALL_DIR/lib:$INSTALL_DIR/bin:$numpy_lib_dir:$NUMPY_INCLUDE_PATH"
 
-cd $CAROLINA_REPO
-pip install .
+cd $CAROLINA_DIR
 
-echo "Pip list ...... "
+pip install .
 pip list | grep carolina
 
 pytest tests
 
+mkdir /tmp/wheels
 mkdir /github/workspace/carolina_dist
 
 pip wheel . -w wheelhouse
-
-mkdir /tmp/wheels
 auditwheel repair wheelhouse/* -w /tmp/wheels
 
 cp /tmp/wheels/carolina*whl /github/workspace/carolina_dist