From 021f75c169175eb3ea5a70d98e9d115f63a3bc70 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 21 Jun 2024 09:45:03 +0200 Subject: [PATCH] spns #42158: Fix MEDCOUPLING V7_8_BR compilation on CO9 - set number of processors to 1 - will fail otherwise --- products/MEDCOUPLING.pyconf | 7 +++---- products/patches/MEDCOUPLING-V7_8_BR-findXdr-CO9.patch | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index c700e97..a4f9014 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -617,9 +617,8 @@ version_V7_8_0_CO9 : "setuptools", "numpy", "scipy", - "lapack", - "CONFIGURATION" + "lapack" ] - - patches: ['MEDCOUPLING-V7_8_BR-findXdr-CO9.patch'] + nb_proc: 1 + patches: ['MEDCOUPLING-V7_8_BR-findXdr-CO9.patch'] } diff --git a/products/patches/MEDCOUPLING-V7_8_BR-findXdr-CO9.patch b/products/patches/MEDCOUPLING-V7_8_BR-findXdr-CO9.patch index 92c8d7d..4ff6fe3 100644 --- a/products/patches/MEDCOUPLING-V7_8_BR-findXdr-CO9.patch +++ b/products/patches/MEDCOUPLING-V7_8_BR-findXdr-CO9.patch @@ -43,7 +43,7 @@ index e8e86253..6e24b6fe 100644 -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XDR REQUIRED_VARS XDR_INCLUDE_DIRS) diff --git a/src/MEDCoupling_Swig/MEDCouplingMemArray.i b/src/MEDCoupling_Swig/MEDCouplingMemArray.i -index f2303876..1fa0d980 100644 +index f2303876..15c5d36e 100644 --- a/src/MEDCoupling_Swig/MEDCouplingMemArray.i +++ b/src/MEDCoupling_Swig/MEDCouplingMemArray.i @@ -2933,7 +2933,7 @@ namespace ParaMEDMEM @@ -51,7 +51,7 @@ index f2303876..1fa0d980 100644 { int nbOfTuples1=PyInt_AS_LONG(nbOfTuples); - if(nbOfTuples<0) -+ if( (int) PyInt_AsLong(nbOfTuples) < 0) ++ if( nbOfTuples1 < 0) throw INTERP_KERNEL::Exception("DataArrayInt::setValue : should be a positive set of allocated memory !"); if(nbOfComp) { -- 2.39.2