Skip to content

Commit

Permalink
Gradle wrapper + fatJar building
Browse files Browse the repository at this point in the history
  • Loading branch information
soywiz committed Dec 14, 2017
1 parent 349d084 commit bca5e8d
Show file tree
Hide file tree
Showing 7 changed files with 309 additions and 27 deletions.
12 changes: 12 additions & 0 deletions build.gradle
@@ -1,4 +1,5 @@
buildscript {
ext.version = '0.0.1-SNAPSHOT'
ext.kotlin_version = '1.2.10'
ext.korio_version = '0.18.0'

Expand Down Expand Up @@ -36,3 +37,14 @@ kotlin {
coroutines "enable"
}
}

task fatJar(type: Jar) {
manifest {
attributes 'Implementation-Title': 'Kaifu2x',
'Implementation-Version': '0.0.1-SNAPSHOT',
'Main-Class': 'com.soywiz.kaifu2x.Kaifu2x'
}
baseName = project.name + '-all'
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
with jar
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
172 changes: 172 additions & 0 deletions gradlew
@@ -0,0 +1,172 @@
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
84 changes: 84 additions & 0 deletions gradlew.bat
@@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
@@ -1,4 +1,4 @@
/*
package com.soywiz.kaifu2x/*
// Move to a library
class DyAccess(val obj: Any?) : Iterable<DyAccess> {
operator fun get(key: Int): DyAccess {
Expand Down
@@ -1,39 +1,49 @@
package com.soywiz.kaifu2x

import com.soywiz.kmem.arraycopy
import com.soywiz.korim.bitmap.Bitmap
import com.soywiz.korim.bitmap.Bitmap32
import com.soywiz.korim.color.RGBA
import com.soywiz.korim.format.PNG
import com.soywiz.korim.format.showImageAndWait
import com.soywiz.korim.format.writeTo
import com.soywiz.korim.format.*
import com.soywiz.korio.Korio
import com.soywiz.korio.lang.ASCII
import com.soywiz.korio.lang.toString
import com.soywiz.korio.serialization.json.Json
import com.soywiz.korio.util.clamp
import com.soywiz.korio.vfs.LocalVfs
import com.soywiz.korio.vfs.resourcesVfs
import java.io.File
import java.util.stream.Collectors
import kotlin.math.max
import kotlin.math.min
import kotlin.system.measureTimeMillis

fun main(args: Array<String>) = Korio {
val model = getModel()
//val image = PNG.decode(resourcesVfs["samples/small.png"]).toBMP32()
val image = PNG.decode(resourcesVfs["samples/goku_small_bg.png"]).toBMP32()
val im = image.scaleNearest(2, 2)
val imYCbCr = im.rgbaToYCbCr()
val Y = imYCbCr.get0f()
lateinit var result: FloatArray2
val time = measureTimeMillis {
result = model.waifu2x(Y) { current, total ->
print("\r" + ((current.toDouble() / total.toDouble()) * 100) + "%")
fun main(args: Array<String>) = Kaifu2x.main(args)

object Kaifu2x {
@JvmStatic fun main(args: Array<String>) = Korio {
if (args.size < 2) {
System.err.println("Usage: kaifu2x <input.png> <output.png>")
System.exit(-1)
}

defaultImageFormats.registerStandard()
val model = getModel()
val image = LocalVfs(File(args[0])).readBitmapNoNative().toBMP32()
val im = image.scaleNearest(2, 2)
val imYCbCr = im.rgbaToYCbCr()
val Y = imYCbCr.get0f()
lateinit var result: FloatArray2
val time = measureTimeMillis {
result = model.waifu2x(Y) { current, total ->
System.err.print("\r" + ((current.toDouble() / total.toDouble()) * 100) + "%")
}
}
System.err.println("Took: " + time.toDouble() / 1000 + " seconds")
val out: Bitmap = imYCbCr.set0f(result).yCbCrToRgba()
val outFile = LocalVfs(File(args[1])).ensureParents()
out.writeTo(outFile)
}
println("Took: " + time.toDouble() / 1000 + " seconds")
val out: Bitmap = imYCbCr.set0f(result).yCbCrToRgba()
//out.writeTo(LocalVfs("/tmp/kaifu2x.sample.png"), formats = PNG)
showImageAndWait(out)
}

object Example {
Expand Down Expand Up @@ -90,8 +100,8 @@ object Example {
}
}

//fun Int.rgbaToYCbCr(): Int = TODO()
//fun Int.yCbCrToRgba(): Int = TODO()
//fun Int.com.soywiz.kaifu2x.rgbaToYCbCr(): Int = TODO()
//fun Int.com.soywiz.kaifu2x.yCbCrToRgba(): Int = TODO()

fun Int.rgbaToYCbCr(): Int {
val R = RGBA.getR(this)
Expand Down Expand Up @@ -217,13 +227,12 @@ data class ModelConfig(
)

suspend fun getModel(): Model {
println("Start")
System.err.print("Reading model...")
val jsonString = resourcesVfs["models/scale2.0x_model.json"].readBytes().toString(ASCII)
println("Readed Json")
val json = Json.decode(jsonString)
val model = parseModel(json)
println("Decoded Json")
return model
return parseModel(json).apply {
System.err.println("Ok")
}
}

fun parseModel(json: Any?): Model {
Expand Down Expand Up @@ -429,5 +438,5 @@ class FloatArray2(val width: Int, val height: Int, val data: FloatArray = FloatA
}
}

override fun toString(): String = "FloatArray2($width, $height)"
override fun toString(): String = "com.soywiz.kaifu2x.FloatArray2($width, $height)"
}

0 comments on commit bca5e8d

Please sign in to comment.