Add android support

Author: Martmists-GH

.gitignore

@@ -6,3 +6,4 @@ cmake-build-*/
 .gradle/
 .kotlin/
 build/
+local.properties

README.md

@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.martmists.ndarray-simd:ndarray-simd:1.4.4")
+    implementation("com.martmists.ndarray-simd:ndarray-simd:1.5.0")
 }
 ```
 

build.gradle.kts

@@ -3,30 +3,49 @@
 import com.vanniktech.maven.publish.SonatypeHost
 import org.gradle.configurationcache.extensions.capitalized
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
 import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
+import org.jetbrains.kotlin.konan.target.KonanTarget
+import java.util.Properties
 
 plugins {
     kotlin("multiplatform")
     `maven-publish`
+    id("com.android.library")
     id("org.jetbrains.dokka")
     id("com.vanniktech.maven.publish")
 }
 
 group = "com.martmists.ndarray-simd"
-version = "1.4.4"
+version = "1.5.0"
 val isProduction = (findProperty("production") ?: System.getProperty("production")) != null
 
 repositories {
+    google()
     mavenCentral()
 }
 
+android {
+    compileSdk = 35
+    namespace = group.toString().replace('-', '.')
+    ndkVersion = "21.4.7075529"
+
+    sourceSets {
+        getByName("debug").jniLibs.srcDirs(project.layout.buildDirectory.dir("generated/jni/Debug"))
+        getByName("release").jniLibs.srcDirs(project.layout.buildDirectory.dir("generated/jni/Release"))
+    }
+}
+
 kotlin {
     jvmToolchain(21)
 
     withSourcesJar()
 
-    jvm()
+    androidTarget {
+        publishLibraryVariants("release", "debug")
+    }
+    jvm("desktop")
 
     val natives = if (isProduction) {
         listOf(
@@ -39,6 +58,9 @@ kotlin {
             // Feel free to open a PR
 //            macosX64(),
 //            macosArm64(),
+
+            androidNativeArm64(),
+            androidNativeX64(),
         )
     } else {
         when (val osArch = System.getProperty("os.arch")) {
@@ -58,26 +80,42 @@ kotlin {
         }
     }
 
+    applyDefaultHierarchyTemplate()
+
     for (native in natives) {
         native.apply {
             binaries {
                 sharedLib {
                     baseName = "ndarray_simd"
+
+                    if (native.targetName.startsWith("android")) {
+                        linkTaskProvider.configure {
+                            doLast {
+                                copy {
+                                    from(outputFile)
+
+                                    val typeName = if (buildType == NativeBuildType.DEBUG) "Debug" else "Release"
+                                    val abiDirName = when (this@sharedLib.target.konanTarget) {
+                                        KonanTarget.ANDROID_ARM32 -> "armeabi-v7a"
+                                        KonanTarget.ANDROID_ARM64 -> "arm64-v8a"
+                                        KonanTarget.ANDROID_X86 -> "x86"
+                                        KonanTarget.ANDROID_X64 -> "x86_64"
+                                        else -> "unknown"
+                                    }
+
+                                    into(project.layout.buildDirectory.dir("generated/jni/$typeName/$abiDirName"))
+                                }
+                            }
+                        }
+
+                        afterEvaluate {
+                            tasks.getByName("preBuild").dependsOn(linkTaskProvider)
+                        }
+                    }
                 }
             }
 
             compilations.named("main") {
-                val jni by cinterops.creating {
-                    val javaHome = File(System.getProperty("java.home")!!)
-                    defFile(projectDir.resolve("src/nativeMain/cinterops/jni.def"))
-                    includeDirs(
-                        javaHome.resolve("include"),
-                        javaHome.resolve("include/linux"),
-                        javaHome.resolve("include/darwin"),
-                        javaHome.resolve("include/win32"),
-                    )
-                }
-
                 val simd by cinterops.creating {
                     defFile(projectDir.resolve("src/nativeMain/cinterops/simd.def"))
                     includeDirs(
@@ -198,25 +236,43 @@ kotlin {
                         dependsOn(arTask)
                     }
                 }
+
+                if (!native.targetName.startsWith("android")) {
+                    val jni by cinterops.creating {
+                        val javaHome = File(System.getProperty("java.home")!!)
+                        defFile(projectDir.resolve("src/desktopNativeMain/cinterops/jni.def"))
+
+                        includeDirs(
+                            javaHome.resolve("include"),
+                            javaHome.resolve("include/linux"),
+                            javaHome.resolve("include/darwin"),
+                            javaHome.resolve("include/win32"),
+                        )
+                    }
+                }
             }
         }
     }
 
     sourceSets {
-        commonTest {
+        val commonMain by getting
+
+        val commonTest by getting {
             dependencies {
                 api(kotlin("test"))
             }
         }
 
-        jvmMain {
+        val jvmMain by creating {
+            dependsOn(commonMain)
+
             dependencies {
                 // Compat: OpenCV
                 compileOnly("org.openpnp:opencv:4.9.0-0")
 
                 // Compat: Exposed+PGVector
                 compileOnly("com.pgvector:pgvector:0.1.6")
-                compileOnly("org.jetbrains.exposed:exposed-core:0.52.0")
+                compileOnly("org.jetbrains.exposed:exposed-core:0.60.0")
 
                 // Compat: Image Formats
                 compileOnly("com.sksamuel.scrimage:scrimage-core:4.1.3")
@@ -226,18 +282,50 @@ kotlin {
                 compileOnly("dev.langchain4j:langchain4j:0.32.0")
 
                 // Compat: kotlinx.dataframe
-                compileOnly("org.jetbrains.kotlinx:dataframe:0.13.1")
+                compileOnly("org.jetbrains.kotlinx:dataframe-core:0.13.1")
             }
         }
 
-        jvmTest {
+        val jvmTest by creating {
+            dependsOn(commonTest)
+
             dependencies {
-                runtimeOnly("org.openpnp:opencv:4.9.0-0")
-                runtimeOnly("com.sksamuel.scrimage:scrimage-core:4.1.3")
-                runtimeOnly("dev.langchain4j:langchain4j:0.32.0")
-                runtimeOnly("org.jetbrains.kotlinx:dataframe:0.13.1")
+                implementation("org.openpnp:opencv:4.9.0-0")
+                implementation("com.sksamuel.scrimage:scrimage-core:4.1.3")
+                implementation("dev.langchain4j:langchain4j:0.32.0")
+                implementation("org.jetbrains.kotlinx:dataframe-core:0.13.1")
+            }
+        }
+
+        val androidMain by getting {
+            dependsOn(jvmMain)
+        }
+
+        val desktopMain by getting {
+            dependsOn(jvmMain)
+        }
+
+        val nativeMain by getting
+
+        val desktopNativeMain by creating {
+            dependsOn(nativeMain)
+        }
+
+        for (native in natives) {
+            if (!native.targetName.startsWith("android")) {
+                named("${native.targetName}Main") {
+                    dependsOn(desktopNativeMain)
+                }
             }
         }
+
+//        val androidUnitTest by getting {
+//            dependsOn(jvmTest)
+//        }
+
+        val desktopTest by getting {
+            dependsOn(jvmTest)
+        }
     }
 }
 
@@ -255,14 +343,23 @@ tasks {
         }
     }
 
-    val jvmProcessResources by existing(Copy::class) {
+    afterEvaluate {
+        named("testDebugUnitTest") {
+            enabled = false
+        }
+        named("testReleaseUnitTest") {
+            enabled = false
+        }
+    }
+
+    val desktopProcessResources by existing(Copy::class) {
         val binaryName = if (isProduction) {
             "releaseShared"
         } else {
             "debugShared"
         }
 
-        for (native in kotlin.targets.withType<KotlinNativeTarget>()) {
+        for (native in kotlin.targets.withType<KotlinNativeTarget>().filter { !it.name.startsWith("android") }) {
             into("META-INF/natives/${native.targetName}") {
                 from(named(native.binaries.getByName(binaryName).linkTaskName)) {
                     exclude("**/*.h")
@@ -340,7 +437,7 @@ if (isProduction) {
 
     mavenPublishing {
         publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
-        coordinates(group as String, name, releaseVersion)
+        coordinates(group.toString(), name, releaseVersion)
         signAllPublications()
 
         pom {

buildSrc/build.gradle.kts

@@ -5,10 +5,12 @@ plugins {
 repositories {
     gradlePluginPortal()
     mavenCentral()
+    google()
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "2.1.0"))
-    implementation("com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.30.0")
+    implementation(kotlin("gradle-plugin", "2.1.20"))
+    implementation("com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.31.0")
     implementation("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:2.0.0")
+    implementation("com.android.tools.build:gradle:8.9.2")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Jul 15 14:03:33 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/androidMain/kotlin/com/martmists/ndarray/simd/compat/image.kt

@@ -0,0 +1,54 @@
+@file:JvmName("ImageAndroidKt")
+
+package com.martmists.ndarray.simd.compat
+
+import android.graphics.Bitmap
+import com.martmists.ndarray.simd.F64Array
+import com.martmists.ndarray.simd.F64Array.Companion.invoke
+import com.martmists.ndarray.simd.F64ImageArray
+import com.sksamuel.scrimage.ImmutableImage
+import com.sksamuel.scrimage.nio.JpegWriter
+import com.sksamuel.scrimage.nio.PngWriter
+import com.sksamuel.scrimage.webp.WebpWriter
+import java.awt.image.BufferedImage
+import java.awt.image.DataBufferByte
+import java.io.File
+
+private fun Int.asColorDouble(): Double = (if (this < 0) 256 + this else this) / 255.0
+
+/**
+ * Reads a BufferedImage into an [F64Array].
+ *
+ * The resulting [F64Array] will have shape `[width, height, 4]`,
+ *  where the 3rd dimension is in order RGBA. All values are in range `[0..1]`
+ *
+ * @param img The image to read from.
+ * @return The [F64Array] read from the image.
+ * @since 1.5.0
+ */
+fun F64Array.Companion.fromImage(img: Bitmap): F64ImageArray {
+    val w = img.width
+    val h = img.height
+    val hasAlpha = img.hasAlpha()
+    val arr = F64Array(w, h, 4).image
+
+    for (y in 0 until h) {
+        for (x in 0 until w) {
+            val px = img.getPixel(x, y)
+            val a = px shr 24
+            val r = (px shr 16) and 0xff
+            val g = (px shr 8) and 0xff
+            val b = px and 0xff
+            if (hasAlpha) {
+                arr[x, y, 3] = a.asColorDouble()
+            } else {
+                arr[x, y, 3] = 1.0
+            }
+            arr[x, y, 0] = r.asColorDouble()
+            arr[x, y, 1] = g.asColorDouble()
+            arr[x, y, 2] = b.asColorDouble()
+        }
+    }
+
+    return arr
+}