ngsolve 6.2.2504.post44.dev0__cp311-cp311-win_amd64.whl → 6.2.2601__cp311-cp311-win_amd64.whl

netgen/include/vector.hpp

@@ -8,6 +8,7 @@
 /**************************************************************************/
 
 #include "expr.hpp"
+#include "core/archive.hpp"
 #include <core/hashtable.hpp>   // for SparseVector
 
 namespace ngbla
@@ -141,9 +142,170 @@ namespace ngbla
   {
   protected:
     typedef MatExpr<VectorView> BASE;
+    
+    /*
     T * __restrict data;
     NO_UNIQUE_ADDRESS TS size;
     NO_UNIQUE_ADDRESS TDIST dist;
+    */
+
+
+    // the data ...
+    
+    template <typename LT>
+    class Layout1
+    {
+      LT * data;
+    public:
+      Layout1() = default;
+      Layout1(const Layout1&) = default;      
+      Layout1(Layout1&&) = default;
+
+      Layout1& operator= (const Layout1&) = default;
+      Layout1& operator= (Layout1&&) = default;
+      
+      ~Layout1() = default;
+      
+      INLINE Layout1 (LT * adata) : data(adata) { } 
+      INLINE auto Data() const { return data; }
+    };
+
+
+    
+    // add the size:  variable, constant, undefined_size
+    
+    template <typename LT, typename LTS>
+    class Layout2 : public Layout1<LT>
+    {
+      typedef Layout1<LT> BASE;
+      LTS size;
+    public:
+      Layout2() = default;
+      Layout2(const Layout2&) = default;      
+      Layout2(Layout2&&) = default;
+
+      Layout2& operator= (const Layout2&) = default;
+      Layout2& operator= (Layout2&&) = default;      
+      ~Layout2() = default;
+      
+      INLINE Layout2 (LT * adata, LTS asize)
+        : BASE(adata), size(asize) { }
+      INLINE Layout2 (LT * adata)
+        : BASE(adata) { }
+
+      
+      INLINE auto Size() const { return size; }
+      using BASE::Data;
+    };
+
+    
+    template <typename LT, int IDIST>
+    class Layout2<LT,IC<IDIST>> : public Layout1<LT>
+    {
+      typedef Layout1<LT> BASE;
+    public:
+      Layout2() = default;
+      Layout2(const Layout2&) = default;      
+      Layout2(Layout2&&) = default;
+
+      Layout2& operator= (const Layout2&) = default;
+      Layout2& operator= (Layout2&&) = default;      
+      ~Layout2() = default;
+      
+      INLINE Layout2 (LT * adata, IC<IDIST> asize)
+        : BASE(adata) { }
+      INLINE Layout2 (LT * adata)
+        : BASE(adata) { }
+      
+      INLINE auto Size() const { return IC<IDIST>(); }
+      using BASE::Data;
+    };
+
+
+#if !defined(NETGEN_ENABLE_CHECK_RANGE)
+    
+    template <typename LT>
+    class Layout2<LT,undefined_size> : public Layout1<LT>
+    {
+      typedef Layout1<LT> BASE;
+    public:
+      Layout2() = default;
+      Layout2(const Layout2&) = default;      
+      Layout2(Layout2&&) = default;
+
+      Layout2& operator= (const Layout2&) = default;
+      Layout2& operator= (Layout2&&) = default;      
+      ~Layout2() = default;
+      
+      INLINE Layout2 (LT * adata, undefined_size asize)
+        : BASE(adata) { }
+      INLINE Layout2 (LT * adata)
+        : BASE(adata) { }
+      
+      INLINE auto Size() const { return undefined_size(); }
+      using BASE::Data;
+    };
+
+#endif
+
+    
+    // add the distance:  variable, constant
+    
+    template <typename LT, typename LTS, typename LTDIST>
+    class Layout : public Layout2<LT,LTS>
+    {
+      typedef Layout2<LT,LTS> BASE;
+      LTDIST dist;
+    public:
+      Layout() = default;
+      Layout(const Layout&) = default;      
+      Layout(Layout&&) = default;
+
+      Layout& operator= (const Layout&) = default;
+      Layout& operator= (Layout&&) = default;
+      ~Layout() = default;
+      
+      INLINE Layout (LT * adata, LTS asize, LTDIST adist)
+        : BASE(adata,asize), dist{adist} { }
+      INLINE Layout (LT * adata, LTS asize)
+        : BASE(adata,asize) { }
+      INLINE Layout (LT * adata)
+        : BASE(adata) { }
+      
+      INLINE auto Dist() const { return dist; }
+      using BASE::Data;
+      using BASE::Size;      
+    };
+
+    
+    template <typename LT, typename LTS, int IDIST>
+    class Layout<LT, LTS, IC<IDIST>> : public Layout2<LT,LTS>
+    {
+      typedef Layout2<LT,LTS> BASE;      
+    public:
+      Layout() = default;
+      Layout(const Layout&) = default;      
+      Layout(Layout&&) = default;
+
+      Layout& operator= (const Layout&) = default;
+      Layout& operator= (Layout&&) = default;
+      ~Layout() = default;
+      
+      INLINE Layout (LT * adata, LTS asize, IC<IDIST> adist)
+        : BASE(adata,asize) { }
+      INLINE Layout (LT * adata, LTS asize)
+        : BASE(adata,asize) { }
+      INLINE Layout (LT * adata)
+        : BASE(adata) { }
+
+      INLINE auto Dist() const { return IC<IDIST>(); }
+      using BASE::Data;
+      using BASE::Size;      
+    };
+    
+    Layout<T,TS,TDIST> layout;
+
+    
   public:
     typedef T TELEM;
     typedef typename mat_traits<T>::TSCAL TSCAL;
@@ -152,33 +314,38 @@ namespace ngbla
     /// linear element access ? 
     static constexpr bool IsLinear() { return std::is_same<type_dist,IC<1>>(); }
     
-    INLINE VectorView () = default;
-    INLINE VectorView (const VectorView&) = default;
-    INLINE VectorView (VectorView&&) = default;
+    VectorView () = default;
+    VectorView (const VectorView&) = default;
+    VectorView (VectorView&&) = default;
     
     template <typename T2, typename TS2, typename TDIST2,
               enable_if_t<is_convertible<T2*,T*>::value, int> =0,
               enable_if_t<is_constructible<TS,TS2>::value, int> =0,
               enable_if_t<is_constructible<TDIST,TDIST2>::value, int> =0>
     INLINE VectorView (const VectorView<T2,TS2,TDIST2> & v2)
-      : data{v2.Data()}, size{TS(v2.Size())}, dist{TDIST(v2.Dist())} { }
+      : layout(v2.Data(), TS(v2.Size()), TDIST(v2.Dist())) { }
+    // : data{v2.Data()}, size{TS(v2.Size())}, dist{TDIST(v2.Dist())} { }
     
     INLINE explicit VectorView (T * adata)
-      : data(adata)
+    // : data(adata)
+      : layout(adata)
     {
       ; // static_assert(std::is_same<type_dist,IC<1>>());
     } 
     INLINE VectorView (TS asize, T * adata)
-      : data(adata), size(asize)
+    // : data(adata), size(asize)
+      : layout(adata, asize) 
     {
       static_assert(std::is_same<type_dist,IC<1>>());
     } 
     INLINE VectorView (TS asize, TDIST adist, T * adata)
-      : data(adata), size(asize), dist(adist) { } 
+    // : data(adata), size(asize), dist(adist) { }
+      : layout(adata, asize, adist) { } 
 
     /// allocate FlatVector on local heap
     INLINE VectorView (size_t as, LocalHeap & lh) 
-      :  data(lh.Alloc<T> (as)), size(as), dist(IC<1>()) { }
+    // :  data(lh.Alloc<T> (as)), size(as), dist(IC<1>()) { }
+      : layout(lh.Alloc<T> (as), as, IC<1>()) { }
 
     template <typename EXPR>
     INLINE VectorView(LocalHeapExpr<EXPR>&& lhe)
@@ -191,7 +358,8 @@ namespace ngbla
 
     template <int S>
     INLINE VectorView (Vec<S,T> & v)
-      : data(v.Data()), size(v.Size()), dist(IC<1>()) { }
+      // : data(v.Data()), size(v.Size()), dist(IC<1>()) { }
+      : layout{v.Data(), TS(v.Size()), (TDIST)IC<1>()} {}
 
     
     /*
@@ -201,7 +369,8 @@ namespace ngbla
     */
     template <int S>
     INLINE VectorView (const Vec<S,T> & v)
-      : data(const_cast<T*>(v.Data())), size(v.Size()), dist(IC<1>()) { }
+    // : data(const_cast<T*>(v.Data())), size(v.Size()), dist(IC<1>()) { }
+      : layout(const_cast<T*>(v.Data()), v.Size(), IC<1>()) { }
     /*
     template <int S>
     INLINE VectorView (Vec<S,const T> & v)
@@ -211,38 +380,46 @@ namespace ngbla
       : data(const_cast<T*>(v.Data())), size(v.Size()), dist(IC<1>()) { } 
     */
     
-    INLINE auto Size() const { return size; }
-    INLINE auto Dist() const { return dist; }
-    INLINE auto Shape() const { return tuple(size); }
+    INLINE auto Size() const { return layout.Size(); }
+    INLINE auto Dist() const { return layout.Dist(); }
+    INLINE auto Shape() const { return tuple(layout.Size()); }
     
 
-    INLINE auto Height () const { return size; }
+    INLINE auto Height () const { return layout.Size(); }
     INLINE auto Width () const { return IC<1>(); }
 
-    INLINE auto Range () const { return IntRange (0, size); }
+    INLINE auto Range () const { return IntRange (0, layout.Size()); }
 
-    INLINE T * Addr(size_t i) const { return data+i*dist; }
-    INLINE T * Data() const { return data; }
+    INLINE T * Addr(size_t i) const { return layout.Data()+i*layout.Dist(); }
+    INLINE T * Data() const { return layout.Data(); }
 
     INLINE auto View() const { return VectorView(*this); }         
     INLINE auto ViewRW() { return this->View(); }    
 
+    void Dump (ostream & ost) const
+    { ost << "VectorView (size=" << Size() << ", dist=" << Dist() << ")"; }
 
 
     /// assign memory for vector on local heap
     INLINE void AssignMemory (size_t as, LocalHeap & lh) 
     {
+      /*
       size = as;
       dist = IC<1>();
       data = lh.Alloc<T>(size);
+      */
+      layout = { lh.Alloc<T>(as), as, IC<1>() };
     }
 
     /// assign memory for vector
     void AssignMemory (size_t as, T * mem) 
     {
+      /*
       size = as;
       dist = IC<1>(); 
       data = mem;
+      */
+      layout = { mem, as, IC<1>() };
     }
     
     INLINE auto & operator= (const VectorView & v)
@@ -295,7 +472,7 @@ namespace ngbla
     {
       NETGEN_CHECK_RANGE(D,0,Size()+1);
       for (int i = 0; i < D; i++)
-	data[i*dist] = v(i);
+	Data()[i*Dist()] = v(i);
       return *this;
     }
     
@@ -303,13 +480,13 @@ namespace ngbla
     INLINE TELEM & operator[] (size_t i) 
     {
       NETGEN_CHECK_RANGE(i,0,Size());
-      return data[i*dist]; 
+      return Data()[i*Dist()]; 
     }
 
     INLINE const TELEM & operator[] (size_t i) const
     {
       NETGEN_CHECK_RANGE(i,0,Size());
-      return data[i*dist]; 
+      return Data()[i*Dist()]; 
     }
 
     
@@ -319,14 +496,14 @@ namespace ngbla
     INLINE TELEM & operator() (I i) const
     {
       NETGEN_CHECK_RANGE(i,0,Size());
-      return data[i*dist]; 
+      return Data()[i*Dist()]; 
     }
 
     /// element access. index j is ignored
     INLINE TELEM & operator() (size_t i, size_t j) const
     {
       NETGEN_CHECK_RANGE(i,0,Size());
-      return data[i*dist]; 
+      return Data()[i*Dist()]; 
     }
     
     RowsArrayExpr<VectorView> operator() (FlatArray<int> rows) const
@@ -337,7 +514,7 @@ namespace ngbla
     INLINE auto Range (size_t first, size_t next) const
     {
       NETGEN_CHECK_RANGE(next,first,Size()+1);
-      return VectorView<T,size_t,TDIST> (next-first, dist, data+first*dist);
+      return VectorView<T,size_t,TDIST> (next-first, Dist(), Data()+first*Dist());
     }
 
     INLINE auto Range (size_t next) const
@@ -353,7 +530,7 @@ namespace ngbla
     INLINE auto RangeN (size_t first, size_t n) const
     {
       NETGEN_CHECK_RANGE(first+n,first,Size()+1);
-      return VectorView<T,size_t,TDIST> (n, dist, data+first*dist);
+      return VectorView<T,size_t,TDIST> (n, Dist(), Data()+first*Dist());
     }
 
 
@@ -369,7 +546,7 @@ namespace ngbla
     INLINE auto Slice(size_t first, size_t dist2) const
     {
       // return VectorView<T,decltype(declval<TS>()/size_t()), decltype(declval<TDIST>()*size_t())> (size/dist2, dist2*dist, Addr(first));
-      return VectorView<T,decltype(declval<TS>()/size_t()), decltype(declval<TDIST>()*size_t())> ( (size-first+dist2-1)/dist2, dist2*dist, Addr(first));
+      return VectorView<T,decltype(declval<TS>()/size_t()), decltype(declval<TDIST>()*size_t())> ( (Size()-first+dist2-1)/dist2, dist2*Dist(), Addr(first));
     }
 
     INLINE auto Reversed() const
@@ -378,15 +555,15 @@ namespace ngbla
       return VectorView<T,TS,decltype(-declval<TDIST>())> { Size(), -Dist(), Addr(Size()-1) };
     }
     
-    INLINE auto operator+(int i) const { return VectorView(size-i, dist, data+i*dist); }
+    INLINE auto operator+(int i) const { return VectorView(Size()-i, Dist(), Data()+i*Dist()); }
 
-    INLINE auto RemoveConst() const { return VectorView<typename remove_const<T>::type,TS,TDIST>(size, dist, const_cast<typename remove_const<T>::type*> (data)); }
+    INLINE auto RemoveConst() const { return VectorView<typename remove_const<T>::type,TS,TDIST>(Size(), Dist(), const_cast<typename remove_const<T>::type*> (Data())); }
     
     INLINE auto AsMatrix (size_t h, size_t w) const
     {
       // todo: checking
       static_assert(std::is_same<TDIST,IC<1>>());
-      return FlatMatrix<T> (h,w, data);
+      return FlatMatrix<T> (h,w, Data());
     }
 
     class Iterator
@@ -404,7 +581,7 @@ namespace ngbla
     };
     
     INLINE Iterator begin() const { return Iterator (*this, 0); }
-    INLINE Iterator end() const { return Iterator (*this, size); }
+    INLINE Iterator end() const { return Iterator (*this, Size()); }
     
   };
     
@@ -445,8 +622,11 @@ namespace ngbla
     }
 
     Vector (Vector && v2)
-      : FlatVector<T> (v2.size, v2.data)
-    { v2.data = nullptr; v2.size = 0; } 
+      : FlatVector<T> (v2.Size(), v2.Data())
+    {
+      v2.layout = { nullptr, 0 };
+      // v2.data = nullptr; v2.size = 0;
+    } 
     
     /// allocate and compute 
     template<typename TB>
@@ -467,7 +647,7 @@ namespace ngbla
 
 
     /// deallocate vector
-    ~Vector() { delete [] this->data; }
+    ~Vector() { delete [] this->Data(); }
 
     /// set vector to constant values
     Vector & operator= (TSCAL scal)
@@ -479,6 +659,7 @@ namespace ngbla
     /// set vector size
     void SetSize(size_t as)
     {
+      /*
       if (this->size == as) return;
       delete [] this->data;
       this->size = as;
@@ -486,6 +667,10 @@ namespace ngbla
         this->data = new T[this->size];
       else
         this->data = nullptr;
+      */
+      if (this->Size() == as) return;
+      delete [] this->Data();
+      this->layout = { (as != 0) ? new T[as] : nullptr , as, IC<1>() };
     }
 
     /// evaluate matrix expression
@@ -505,8 +690,9 @@ namespace ngbla
 
     Vector & operator= (Vector && v2)
     {
-      this->size = v2.size;
-      Swap (this->data, v2.data);
+      // this->size = v2.size;
+      // Swap (this->data, v2.data);
+      Swap (this->layout, v2.layout);
       return *this;
     }
 
@@ -545,7 +731,7 @@ namespace ngbla
                                                            &mem[0] : new T[as]) { ; }
 
     /// deallocates dynamic memory
-    INLINE ~VectorMem() { if (this->Size() > S) delete [] this->data; }
+    INLINE ~VectorMem() { if (this->Size() > S) delete [] this->Data(); }
 
     /// assigns constant value
     INLINE VectorMem & operator= (TSCAL scal)
@@ -701,7 +887,8 @@ namespace ngbla
     */
     
     Vec (const Vec &) = default;
-    auto & HTData() const { return data; }                                    
+    auto & HTData() { return data; }
+    const auto & HTData() const { return data; }                                        
     template <typename T2>
     Vec (const Vec<S,T2> & v2) : data(v2.HTData()) { ; }
 
@@ -845,6 +1032,12 @@ namespace ngbla
     INLINE /* const */ FlatVector<T> Range(size_t first, size_t next) 
     { return FlatVector<T> (next-first, data+first); }
 
+    void DoArchive(Archive & ar)
+    {
+      for (size_t i = 0; i < S; i++)
+        ar & data[i];
+    }
+
     const T * begin() const { return data.Ptr(); }
     const T * end() const { return data.Ptr()+S; }
     T * begin() { return data.Ptr(); }
@@ -977,8 +1170,13 @@ namespace ngbla
   }
 
 
-
-
+  template <int S, typename T = double>
+  auto UnitVec(size_t i)
+  {
+    Vec<S,T> ei = T(0.0);
+    ei(i) = T(1.0);
+    return ei;
+  }
 
   template <class TV, class TSCAL> class Scalar2ElemVector
   {
@@ -1196,24 +1394,51 @@ namespace ngbla
     for (int i = 0; i < DIM; i++)
       AtomicAdd (x(i), y(i));
   }
-  
 
-}
 
-namespace ngstd
-{
-  template <typename ARCHIVE, int S, typename T>
-  inline auto & operator& (ARCHIVE & ar, ngbla::Vec<S,T> & v)
+  template <typename T, typename TS, typename TDIST, typename TB>
+  inline void AtomicAdd (VectorView<T,TS,TDIST> v, const Expr<TB> & v2)
   {
-    for (int i = 0; i < S; i++)
-      ar & v(i);
-    return ar;
+    auto viewv2 = v2.View();
+    auto combsize = CombinedSize(v.Size(), v2.Height());
+    for (size_t i = 0; i < combsize; i++)
+      AtomicAdd (v(i), viewv2(i));
   }
+
+  
 }
 
 
 namespace ngcore
 {
+
+  template <typename T, size_t S> class MakeSimdCl;
+  
+  template <typename T, size_t S, int VS>
+  class MakeSimdCl<ngbla::Vec<VS,T>,S>
+  {
+    std::array<ngbla::Vec<VS,T>,S> a;
+  public:
+    MakeSimdCl (std::array<ngbla::Vec<VS,T>,S> aa) : a(aa)  { ; }
+    
+    auto Get() const
+    {
+      std::array<T,S> ai;
+      ngbla::Vec<VS, decltype(MakeSimd(ai))> res;
+      for (int i = 0; i < VS; i++)
+        {
+          for (int j = 0; j < S; j++)
+            ai[j] = a[j](i);
+          res(i) = MakeSimd(ai);
+        }
+      return res;
+    }
+  };
+  
+  
+
+
+  
   template<typename T> struct MPI_typetrait;
   
   template<int S, typename T>

netgen/ngscxx.bat

@@ -1,4 +1,4 @@
 set NGSCXX_DIR=%~dp0
 call "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat" amd64
 
- cl /c /O2 /Ob2 /DNDEBUG /DWIN32 /D_WINDOWS /GR /EHsc  /DHAVE_NETGEN_SOURCES /DUSE_TIMEOFDAY /DTCL /DLAPACK /DUSE_PARDISO /DNGS_PYTHON /DNETGEN_PYTHON /DNG_PYTHON /DPYBIND11_SIMPLE_GIL_MANAGEMENT /D_WIN32_WINNT=0x1000 /DWNT /DWNT_WINDOW /DNOMINMAX /DMSVC_EXPRESS /D_CRT_SECURE_NO_WARNINGS /DHAVE_STRUCT_TIMESPEC /DWIN32 /DPARALLEL /DNG_MPI_WRAPPER /std:c++17 /bigobj /wd4068 -DMAX_SYS_DIM=3 /arch:AVX2 /bigobj  /I"C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/include" /I"C:/Python311/include" /I"%NGSCXX_DIR%/include" /I"%NGSCXX_DIR%/include/include" %*
+ cl /c /O2 /Ob2 /DNDEBUG /DWIN32 /D_WINDOWS /GR /EHsc  /DHAVE_NETGEN_SOURCES /DUSE_TIMEOFDAY /DTCL /DLAPACK /DUSE_PARDISO /DNGS_PYTHON /DNETGEN_PYTHON /DNG_PYTHON /DPYBIND11_SIMPLE_GIL_MANAGEMENT /D_WIN32_WINNT=0x1000 /DWNT /DWNT_WINDOW /DNOMINMAX /DMSVC_EXPRESS /D_CRT_SECURE_NO_WARNINGS /DHAVE_STRUCT_TIMESPEC /DWIN32 /DPARALLEL /DNG_MPI_WRAPPER /std:c++17 /bigobj /wd4068 -DMAX_SYS_DIM=3 /arch:AVX2 /bigobj /MD  /I"C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/venv_ngs/Library/include" /I"C:/Python311/include" /I"%NGSCXX_DIR%/include" /I"%NGSCXX_DIR%/include/include" %*

netgen/ngsld.bat

@@ -3,4 +3,4 @@ call "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build
 
  for /f  %%a in ('python -c "import sys,os; print(os.path.join(sys.base_prefix, 'libs'))"') do set PYTHON_LIBDIR="%%a"
 
-link /DLL %*  -LC:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/lib -l_rt /LIBPATH:"%NGSCXX_DIR%/lib" nglib.lib ngcore.lib libngsolve.lib /LIBPATH:"%PYTHON_LIBDIR%"
+link /DLL %*  -LC:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/venv_ngs/Library/lib -l_rt /LIBPATH:"%NGSCXX_DIR%/lib" nglib.lib ngcore.lib libngsolve.lib /LIBPATH:"%PYTHON_LIBDIR%"

ngsolve/cmake/NGSolveConfig.cmake

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "6.2.2504-44-g8fbbbc389")
+set(PACKAGE_VERSION "6.2.2601")
 find_package(Netgen CONFIG REQUIRED HINTS
   ${CMAKE_CURRENT_LIST_DIR}
   ${CMAKE_CURRENT_LIST_DIR}/..
@@ -18,20 +18,20 @@ set(NGSOLVE_CXX_COMPILER "C:/Program Files/Microsoft Visual Studio/2022/Communit
 set(NGSOLVE_CMAKE_BUILD_TYPE "Release")
 
 set(NGSOLVE_CMAKE_THREAD_LIBS_INIT "")
-set(NGSOLVE_MKL_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/lib/mkl_rt.lib")
+set(NGSOLVE_MKL_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/venv_ngs/Library/lib/mkl_rt.lib")
 set(NGSOLVE_PYBIND_INCLUDE_DIR "")
 set(NGSOLVE_PYTHON_INCLUDE_DIRS "C:/Python311/include")
 set(NGSOLVE_PYTHON_LIBRARIES "C:/Python311/libs/python311.lib")
 set(NGSOLVE_PYTHON_PACKAGES_INSTALL_DIR  "")
-set(NGSOLVE_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tcl/generic")
+set(NGSOLVE_TCL_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tcl/generic")
 set(NGSOLVE_TCL_LIBRARY "C:/Python311/tcl/tclstub86.lib")
 set(NGSOLVE_TK_DND_LIBRARY "")
-set(NGSOLVE_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tk/generic")
+set(NGSOLVE_TK_INCLUDE_PATH "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/src/project_tk/generic")
 set(NGSOLVE_TK_LIBRARY "C:/Python311/tcl/tkstub86.lib")
 set(NGSOLVE_X11_X11_LIB "")
 set(NGSOLVE_X11_Xmu_LIB "")
-set(NGSOLVE_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/include")
-set(NGSOLVE_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/ngsolve/external_dependencies/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
+set(NGSOLVE_ZLIB_INCLUDE_DIRS "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/include")
+set(NGSOLVE_ZLIB_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/netgen/_skbuild/win-amd64-3.11/cmake-build/dependencies/zlib/lib/zlibstatic.lib")
 
 set(NGSOLVE_INTEL_MIC       OFF)
 set(NGSOLVE_USE_CCACHE ON)
@@ -50,8 +50,8 @@ set(NGSOLVE_USE_VTUNE       OFF)
 set(NGSOLVE_MAX_SYS_DIM       3)
 
 set(NGSOLVE_COMPILE_FLAGS " /DHAVE_NETGEN_SOURCES /DUSE_TIMEOFDAY /DTCL /DLAPACK /DUSE_PARDISO /DNGS_PYTHON /DNETGEN_PYTHON /DNG_PYTHON /DPYBIND11_SIMPLE_GIL_MANAGEMENT /D_WIN32_WINNT=0x1000 /DWNT /DWNT_WINDOW /DNOMINMAX /DMSVC_EXPRESS /D_CRT_SECURE_NO_WARNINGS /DHAVE_STRUCT_TIMESPEC /DWIN32 /DPARALLEL /DNG_MPI_WRAPPER" CACHE STRING "Preprocessor definitions of ngscxx")
-set(NGSOLVE_LINK_FLAGS " -LC:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/lib -l_rt /LIBPATH:\"%NGSCXX_DIR%/lib\" nglib.lib ngcore.lib libngsolve.lib /LIBPATH:\"%PYTHON_LIBDIR%\"" CACHE STRING "Link flags set in ngsld")
-set(NGSOLVE_INCLUDE_DIRS C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/include;C:/Python311/include CACHE STRING "Include dirs set in ngscxx")
+set(NGSOLVE_LINK_FLAGS " -LC:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/venv_ngs/Library/lib -l_rt /LIBPATH:\"%NGSCXX_DIR%/lib\" nglib.lib ngcore.lib libngsolve.lib /LIBPATH:\"%PYTHON_LIBDIR%\"" CACHE STRING "Link flags set in ngsld")
+set(NGSOLVE_INCLUDE_DIRS C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/venv_ngs/Library/include;C:/Python311/include CACHE STRING "Include dirs set in ngscxx")
 
 set(NGSOLVE_INSTALL_DIR_PYTHON  .)
 set(NGSOLVE_INSTALL_DIR_BIN     netgen)

ngsolve/cmake/ngsolve-targets.cmake

@@ -19,7 +19,7 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_cmake_targets_defined "")
 set(_cmake_targets_not_defined "")
 set(_cmake_expected_targets "")
-foreach(_cmake_expected_target IN ITEMS netgen_libs ngs_lapack ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve)
+foreach(_cmake_expected_target IN ITEMS netgen_lib netgen_core_lib ngs_lapack ngstd ngbla ngla ngfem ngsbem ngcomp ngsolve)
   list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
   if(TARGET "${_cmake_expected_target}")
     list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
@@ -54,19 +54,26 @@ if(_IMPORT_PREFIX STREQUAL "/")
   set(_IMPORT_PREFIX "")
 endif()
 
-# Create imported target netgen_libs
-add_library(netgen_libs INTERFACE IMPORTED)
+# Create imported target netgen_lib
+add_library(netgen_lib INTERFACE IMPORTED)
 
-set_target_properties(netgen_libs PROPERTIES
-  INTERFACE_LINK_LIBRARIES "nglib;ngcore"
+set_target_properties(netgen_lib PROPERTIES
+  INTERFACE_LINK_LIBRARIES "nglib"
+)
+
+# Create imported target netgen_core_lib
+add_library(netgen_core_lib INTERFACE IMPORTED)
+
+set_target_properties(netgen_core_lib PROPERTIES
+  INTERFACE_LINK_LIBRARIES "ngcore"
 )
 
 # Create imported target ngs_lapack
 add_library(ngs_lapack INTERFACE IMPORTED)
 
 set_target_properties(ngs_lapack PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/include"
-  INTERFACE_LINK_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns/0/ngsolve/venv_ngs/Library/lib/mkl_rt.lib"
+  INTERFACE_INCLUDE_DIRECTORIES "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/venv_ngs/Library/include"
+  INTERFACE_LINK_LIBRARIES "C:/gitlabci/tools/builds/3zsqG5ns9/0/ngsolve/venv_ngs/Library/lib/mkl_rt.lib"
 )
 
 # Create imported target ngstd
@@ -75,7 +82,7 @@ add_library(ngstd INTERFACE IMPORTED)
 set_target_properties(ngstd PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "HAVE_NETGEN_SOURCES;USE_TIMEOFDAY;TCL;LAPACK;USE_PARDISO;NGS_PYTHON"
   INTERFACE_COMPILE_OPTIONS "/std:c++17;/bigobj;/wd4068;-DMAX_SYS_DIM=3"
-  INTERFACE_LINK_LIBRARIES "netgen_libs;\$<LINK_ONLY:>"
+  INTERFACE_LINK_LIBRARIES "netgen_core_lib;\$<LINK_ONLY:>"
 )
 
 # Create imported target ngbla
@@ -110,14 +117,14 @@ set_target_properties(ngsbem PROPERTIES
 add_library(ngcomp INTERFACE IMPORTED)
 
 set_target_properties(ngcomp PROPERTIES
-  INTERFACE_LINK_LIBRARIES "ngfem;ngla;ngbla;ngstd;\$<LINK_ONLY:>"
+  INTERFACE_LINK_LIBRARIES "ngfem;ngla;ngbla;ngstd;\$<LINK_ONLY:>;netgen_lib"
 )
 
 # Create imported target ngsolve
 add_library(ngsolve SHARED IMPORTED)
 
 set_target_properties(ngsolve PROPERTIES
-  INTERFACE_LINK_LIBRARIES "netgen_libs;ngsolve;ngcomp;ngfem;ngsbem;ngbla;ngla;ngstd"
+  INTERFACE_LINK_LIBRARIES "netgen_lib;netgen_core_lib;ngsolve;ngcomp;ngfem;ngsbem;ngbla;ngla;ngstd"
 )
 
 if(CMAKE_VERSION VERSION_LESS 3.0.0)