Merge pull request #199 from vincentcasseau/main

PyPI: fix install on azure with prodmode 2
onera · Oct 15, 2024 · 6938302 · 6938302
2 parents b8053a6 + 90b7698
commit 6938302
Show file tree

Hide file tree

Showing 28 changed files with 37 additions and 294 deletions.
diff --git a/.github/workflows/publish-pypi.yml.disabled b/.github/workflows/publish-pypi.yml.disabled
diff --git a/Cassiopee/CPlot/install b/Cassiopee/CPlot/install
@@ -35,7 +35,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Compressor/install b/Cassiopee/Compressor/install
@@ -34,7 +34,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Connector/install b/Cassiopee/Connector/install
@@ -37,7 +37,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Converter/install b/Cassiopee/Converter/install
@@ -37,7 +37,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Dist2Walls/install b/Cassiopee/Dist2Walls/install
@@ -35,7 +35,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Generator/install b/Cassiopee/Generator/install
@@ -37,7 +37,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Geom/install b/Cassiopee/Geom/install
@@ -38,7 +38,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Initiator/install b/Cassiopee/Initiator/install
@@ -38,7 +38,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Intersector/install b/Cassiopee/Intersector/install
@@ -38,7 +38,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/KCore/installBase.py b/Cassiopee/KCore/installBase.py
@@ -728,7 +728,7 @@
 [] # NvccAdditionalOptions
 ],
 ###############################################################################
-'azure': [ 'Linux ubuntu 24.04 - Github Actions',
+'azure': [ 'Linux ubuntu 20.04 - Github Actions',
 'gfortran', # f77compiler
 'gfortran', # f90compiler
 'gcc', # Cppcompiler

diff --git a/Cassiopee/OCC/install b/Cassiopee/OCC/install
@@ -41,7 +41,7 @@ fi
 #cd ..
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Post/install b/Cassiopee/Post/install
@@ -37,7 +37,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/RigidMotion/install b/Cassiopee/RigidMotion/install
@@ -35,7 +35,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Template/install b/Cassiopee/Template/install
@@ -35,7 +35,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 0 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/Transform/install b/Cassiopee/Transform/install
@@ -37,7 +37,7 @@ if [ "$PRODMODE" = "" ]; then
 fi
 
 # Compilation et installation
-if [ $PRODMODE -le 1 ]; then
+if [ $PRODMODE -le 2 ]; then
     sconsf=`which scons`
     if [ "$OMP_NUM_THREADS" != "" ]; then
         export SCONSOPT="-j $OMP_NUM_THREADS"

diff --git a/Cassiopee/XCore/XCore/AdaptMesh/AdaptMesh_Init.cpp b/Cassiopee/XCore/XCore/AdaptMesh/AdaptMesh_Init.cpp
@@ -17,7 +17,7 @@
     along with Cassiopee.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "Mesh.h"
-#include "Karray.h"
+#include "common/Karray.h"
 #include "common/mem.h"
 
 PyObject *K_XCORE::AdaptMesh_Init(PyObject *self, PyObject *args)

diff --git a/Cassiopee/XCore/XCore/AdaptMesh/MeshInit.cpp b/Cassiopee/XCore/XCore/AdaptMesh/MeshInit.cpp
@@ -17,7 +17,7 @@
     along with Cassiopee.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "Mesh.h"
-#include "Karray.h"
+#include "common/Karray.h"
 #include "common/mem.h"
 
 Mesh::Mesh()
@@ -87,9 +87,9 @@ Mesh::Mesh()
 Mesh *Mesh_from_Karray(Karray *karray)
 {    
     E_Int np = karray->npoints();
-    E_Float *X = karray->X();
-    E_Float *Y = karray->Y();
-    E_Float *Z = karray->Z();
+    E_Float *X = karray->x;
+    E_Float *Y = karray->y;
+    E_Float *Z = karray->z;
 
     E_Int nf = karray->nfaces();
 

diff --git a/Cassiopee/XCore/XCore/AdaptMesh/Karray.cpp → Cassiopee/XCore/XCore/common/Karray.cpp b/Cassiopee/XCore/XCore/AdaptMesh/Karray.cpp → Cassiopee/XCore/XCore/common/Karray.cpp
diff --git a/Cassiopee/XCore/XCore/AdaptMesh/Karray.h → Cassiopee/XCore/XCore/common/Karray.h b/Cassiopee/XCore/XCore/AdaptMesh/Karray.h → Cassiopee/XCore/XCore/common/Karray.h
@@ -43,18 +43,14 @@ struct Karray {
     inline E_Int *ngon() const { return cn->getNGon(); }
     inline E_Int *nface() const { return cn->getNFace(); }
 
-    inline E_Float *X() const { return x; }
-    inline E_Float *Y() const { return y; }
-    inline E_Float *Z() const { return z; }
-
     inline E_Int *get_face(E_Int face, E_Int &np) const
     { return cn->getFace(face, np, ngon(), indpg()); }
 
     inline E_Int *get_cell(E_Int cell, E_Int &nf) const
     { return cn->getElt(cell, nf, nface(), indph()); }
 
     inline E_Int orient_boundary()
-    { return K_CONNECT::orient_boundary_ngon(X(), Y(), Z(), *cn); }
+    { return K_CONNECT::orient_boundary_ngon(x, y, z, *cn); }
 
     inline E_Int build_parent_elements(E_Int *owner, E_Int *neigh)
     { return K_CONNECT::build_parent_elements_ngon(*cn, owner, neigh); }
@@ -66,4 +62,4 @@ E_Int Karray_parse_ngon(PyObject *pyobject, Karray &karray);
 
 void Karray_free_structured(Karray &karray);
 
-E_Int Karray_parse_structured(PyObject *pyobject, Karray &karray);
+E_Int Karray_parse_structured(PyObject *pyobject, Karray &karray);
diff --git a/Cassiopee/XCore/XCore/intersectMesh/IntersectMesh_Init.cpp b/Cassiopee/XCore/XCore/intersectMesh/IntersectMesh_Init.cpp
@@ -17,7 +17,7 @@
     along with Cassiopee.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mesh.h"
-#include "karray.h"
+#include "common/Karray.h"
 //#include "BVH.h"
 
 PyObject *K_XCORE::IntersectMesh_Init(PyObject *self, PyObject *args)
@@ -39,7 +39,7 @@ PyObject *K_XCORE::IntersectMesh_Init(PyObject *self, PyObject *args)
 
     // Init mesh
 
-    IMesh *M = new IMesh(*karray.cn, karray.X, karray.Y, karray.Z, karray.npts);
+    IMesh *M = new IMesh(*karray.cn, karray.x, karray.y, karray.z, karray.npts);
     /*
     M->make_skin();
     puts("Making BVH");

diff --git a/Cassiopee/XCore/XCore/intersectMesh/extract.cpp b/Cassiopee/XCore/XCore/intersectMesh/extract.cpp
@@ -1,5 +1,5 @@
 #include "mesh.h"
-#include "karray.h"
+#include "common/Karray.h"
 
 PyObject *K_XCORE::extractCell(PyObject *self, PyObject *args)
 {
@@ -19,7 +19,7 @@ PyObject *K_XCORE::extractCell(PyObject *self, PyObject *args)
 
     if (ret != 0) return NULL;
 
-    IMesh M(*marray.cn, marray.X, marray.Y, marray.Z, marray.npts);
+    IMesh M(*marray.cn, marray.x, marray.y, marray.z, marray.npts);
 
     IMesh M_out;
 
@@ -91,4 +91,4 @@ PyObject *K_XCORE::extractCell(PyObject *self, PyObject *args)
 
 
     return M_out.export_karray();
-}
+}
diff --git a/Cassiopee/XCore/XCore/intersectMesh/intersectMesh.cpp b/Cassiopee/XCore/XCore/intersectMesh/intersectMesh.cpp
@@ -17,7 +17,7 @@
     along with Cassiopee.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "xcore.h"
-#include "karray.h"
+#include "common/Karray.h"
 #include "common/common.h"
 #include "mesh.h"
 #include "smesh.h"
@@ -312,7 +312,7 @@ PyObject *K_XCORE::intersectMesh(PyObject *self, PyObject *args)
     }
 
     // Init and orient master/slave meshes
-    IMesh S(*sarray.cn, sarray.X, sarray.Y, sarray.Z, sarray.npts);
+    IMesh S(*sarray.cn, sarray.x, sarray.y, sarray.z, sarray.npts);
 
     M.make_skin();
     S.make_skin();