make mkl as an independent module

2025-12-08 20:36:05 +00:00 · 2023-07-25 14:20:30 +08:00 · 2023-07-25 14:20:30 +08:00 · dffb2da247
commit dffb2da247
parent 3faff59cf7
27 changed files with 230 additions and 25 deletions
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA" serialisationVersion="2">
+    <checkstyleVersion>10.12.0</checkstyleVersion>
+    <scanScope>JavaOnly</scanScope>
+    <copyLibs>true</copyLibs>
+    <option name="thirdPartyClasspath" />
+    <option name="activeLocationIds" />
+    <option name="locations">
+      <list>
+        <ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
+        <ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
+      </list>
+    </option>
+  </component>
+</project>
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -11,6 +11,7 @@
        <module name="meteoinfo-geometry" />
        <module name="meteoinfo-lab" />
        <module name="meteoinfo-projection" />
+        <module name="meteoinfo-mkl" />
        <module name="meteoinfo-console" />
        <module name="meteoinfo-geo" />
        <module name="meteoinfo-chart" />
@ -19,8 +20,8 @@
        <module name="meteoinfo-data" />
        <module name="meteoinfo-dataframe" />
        <module name="meteoinfo-map" />
-        <module name="meteoinfo-math" />
        <module name="meteoinfo-ui" />
+        <module name="meteoinfo-math" />
        <module name="meteoinfo-common" />
      </profile>
    </annotationProcessing>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@ -21,8 +21,12 @@
    <file url="file://$PROJECT_DIR$/meteoinfo-lab/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/meteoinfo-map/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/meteoinfo-map/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/meteoinfo-math/meteoinfo-mkl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/meteoinfo-math/meteoinfo-mkl/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/meteoinfo-math/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/meteoinfo-math/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/meteoinfo-mkl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/meteoinfo-mkl/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/meteoinfo-ndarray/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/meteoinfo-ndarray/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/meteoinfo-projection/src/main/java" charset="UTF-8" />
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -8,8 +8,13 @@
        <option value="$PROJECT_DIR$/meteoinfo-map/pom.xml" />
      </list>
    </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/meteoinfo-math/meteoinfo-mkl/pom.xml" />
+      </set>
+    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/classes" />
  </component>
 </project>
--- a/MeteoInfo.iml
+++ b/MeteoInfo.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-chart/meteoinfo-chart.iml
+++ b/meteoinfo-chart/meteoinfo-chart.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-common/meteoinfo-common.iml
+++ b/meteoinfo-common/meteoinfo-common.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-console/meteoinfo-console.iml
+++ b/meteoinfo-console/meteoinfo-console.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-data/meteoinfo-data.iml
+++ b/meteoinfo-data/meteoinfo-data.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-dataframe/meteoinfo-dataframe.iml
+++ b/meteoinfo-dataframe/meteoinfo-dataframe.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-geo/meteoinfo-geo.iml
+++ b/meteoinfo-geo/meteoinfo-geo.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-geometry/meteoinfo-geometry.iml
+++ b/meteoinfo-geometry/meteoinfo-geometry.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-image/meteoinfo-image.iml
+++ b/meteoinfo-image/meteoinfo-image.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-lab/meteoinfo-lab.iml
+++ b/meteoinfo-lab/meteoinfo-lab.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-lab/milconfig.xml
+++ b/meteoinfo-lab/milconfig.xml
@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <MeteoInfo File="milconfig.xml" Type="configurefile">
-  <Path OpenPath="D:\Working\MIScript\Jython\mis\map\webmap">
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\LaSW\ZhengZhou"/>
-    <RecentFolder Folder="D:\MyProgram\java\MeteoInfoDev\MeteoInfo\meteoinfo-lab"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
+  <Path OpenPath="D:\Working\MIScript\Jython\mis\common_math\linalg">
    <RecentFolder Folder="D:\Working\MIScript\Jython"/>
    <RecentFolder Folder="D:\Working\MIScript"/>
    <RecentFolder Folder="D:\Working\MIScript\cuace_dust"/>
    <RecentFolder Folder="D:\Working\MIScript\cuace_dust\py"/>
    <RecentFolder Folder="D:\Working\MIScript\cuace_dust\py\plot"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\array"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\array\complex"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\traj"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\webmap"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\linalg"/>
  </Path>
  <File>
    <OpenedFiles>
      <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\_reload.py"/>
      <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_bz2_3d_1.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\map\webmap\webmap_1.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\linalg\dot_4.py"/>
+      <OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\linalg\dot_1.py"/>
    </OpenedFiles>
    <RecentFiles>
      <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\_reload.py"/>
      <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d\mainGUI.py"/>
      <RecentFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_bz2_3d_1.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\map\webmap\webmap_1.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\common_math\linalg\dot_4.py"/>
+      <RecentFile File="D:\Working\MIScript\Jython\mis\common_math\linalg\dot_1.py"/>
    </RecentFiles>
  </File>
  <Font>
@ -36,5 +38,5 @@
  </Font>
  <LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
  <Figure DoubleBuffering="true"/>
-  <Startup MainFormLocation="-7,0" MainFormSize="1388,743"/>
+  <Startup MainFormLocation="-7,0" MainFormSize="1410,778"/>
 </MeteoInfo>
--- a/meteoinfo-lab/pylib/mipylib/init$py.class
+++ b/meteoinfo-lab/pylib/mipylib/init$py.class
--- a/meteoinfo-lab/pylib/mipylib/init.py
+++ b/meteoinfo-lab/pylib/mipylib/init.py
@ -12,12 +12,13 @@ import imagelib
 from dataframe import *
 import enum

-print('MeteoInfoLab 3.6.3')
-
 import os
 mi_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 migl.mifolder = mi_dir

+__version__ = '3.6.3'
+pstr = 'MeteoInfoLab {}'.format(__version__)
+
 lookup_cma = os.path.join(mi_dir, 'tables', 'bufr', 'tablelookup_cma.csv')
 if os.path.isfile(lookup_cma):
    try:
@ -25,4 +26,6 @@ if os.path.isfile(lookup_cma):
    except:
        is_ok = False
    if is_ok:
-        print('CMA Bufr lookup file added.')
+        pstr += ' (CMA Bufr lookup file added)'
+
+print(pstr)
--- a/meteoinfo-map/meteoinfo-map.iml
+++ b/meteoinfo-map/meteoinfo-map.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-math/meteoinfo-math.iml
+++ b/meteoinfo-math/meteoinfo-math.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-math/pom.xml
+++ b/meteoinfo-math/pom.xml
@ -53,16 +53,6 @@
            <artifactId>openblas-platform</artifactId>
            <version>0.3.10-1.5.4</version>
        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>mkl-platform</artifactId>
-            <version>2020.3-1.5.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>mkl-platform-redist</artifactId>
-            <version>2020.3-1.5.4</version>
-        </dependency>
        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter</artifactId>
--- a/meteoinfo-mkl/pom.xml
+++ b/meteoinfo-mkl/pom.xml
@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.meteothink</groupId>
+        <artifactId>MeteoInfo</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>meteoinfo-mkl</artifactId>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>meteoinfo-math</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacpp-platform</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>mkl-platform</artifactId>
+            <version>2020.3-1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>mkl-platform-redist</artifactId>
+            <version>2020.3-1.5.4</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <excludeScope>provided</excludeScope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>-->
+            <plugin>
+                <inherited>true</inherited>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <failOnError>false</failOnError>
+                            <failOnWarnings>false</failOnWarnings>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
--- a/meteoinfo-math/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java
+++ b/meteoinfo-math/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java
@ -17,10 +17,12 @@

 package org.meteoinfo.math.blas.mkl;

+import org.meteoinfo.math.blas.*;
+
 import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
-import org.meteoinfo.math.blas.*;
+
 import static org.bytedeco.mkl.global.mkl_rt.*;
 import static org.bytedeco.openblas.global.openblas.LAPACKE_dorgqr;
 import static org.bytedeco.openblas.global.openblas.LAPACKE_dorgrq;
--- a/meteoinfo-ndarray/meteoinfo-ndarray.iml
+++ b/meteoinfo-ndarray/meteoinfo-ndarray.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-projection/meteoinfo-projection.iml
+++ b/meteoinfo-projection/meteoinfo-projection.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-table/meteoinfo-table.iml
+++ b/meteoinfo-table/meteoinfo-table.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/meteoinfo-ui/meteoinfo-ui.iml
+++ b/meteoinfo-ui/meteoinfo-ui.iml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
+</module>
--- a/pom.xml
+++ b/pom.xml
@ -28,6 +28,7 @@
        <module>meteoinfo-dataframe</module>
        <module>meteoinfo-data</module>
        <module>meteoinfo-projection</module>
+        <module>meteoinfo-mkl</module>
    </modules>
    
    <properties>