azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[samples] Allow using KONAN_DATA_DIR in samples

Browse Source
This commit is contained in:
Ilya Matveev
2018-04-12 17:02:16 +07:00
committed by ilmat192
parent 89e8d43055
commit a0fc9ae0eb
14 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/curl/build.gradle
+1
View File
@@ -22,6 +22,7 @@ repositories {
konanArtifacts { konanArtifacts {
program('Curl') { program('Curl') {
dependsOn ':libcurl:publish'
dependencies { dependencies {
artifactCurl 'org.jetbrains.kotlin.native:libcurl:1.0' artifactCurl 'org.jetbrains.kotlin.native:libcurl:1.0'
} }
samples/konan.sh
+1 -1
View File
@@ -6,5 +6,5 @@ else
PATH="$KONAN_HOME/bin:$PATH" PATH="$KONAN_HOME/bin:$PATH"
fi fi
KONAN_USER_DIR="$HOME/.konan" KONAN_USER_DIR=${KONAN_DATA_DIR:-"$HOME/.konan"}
KONAN_DEPS="$KONAN_USER_DIR/dependencies" KONAN_DEPS="$KONAN_USER_DIR/dependencies"
samples/tensorflow/README.md
+2 -1
View File
@@ -13,7 +13,8 @@ showing how a TensorFlow client in Kotlin/Native could look like.
./downloadTensorflow.sh ./downloadTensorflow.sh
will install [TensorFlow for C](https://www.tensorflow.org/versions/r1.1/install/install_c) into will install [TensorFlow for C](https://www.tensorflow.org/versions/r1.1/install/install_c) into
`$HOME/.konan/third-party/tensorflow` (if not yet done). `$HOME/.konan/third-party/tensorflow` (if not yet done). One may override the location of
`third-party/tensorflow` by setting the `KONAN_DATA_DIR` environment variable.
To build use `../gradlew build` or `./build.sh`. To build use `../gradlew build` or `./build.sh`.
samples/tensorflow/build.gradle
+2 -1
View File
@@ -2,7 +2,8 @@ apply plugin: 'konan'
konan.targets = ['macbook', 'linux'] konan.targets = ['macbook', 'linux']
def tensorflowHome = "${System.getProperty("user.home")}/.konan/third-party/tensorflow" def konanUserDir = System.getenv("KONAN_DATA_DIR") ?: "${System.getProperty("user.home")}/.konan"
def tensorflowHome = "$konanUserDir/third-party/tensorflow"
task downloadTensorflow(type: Exec) { task downloadTensorflow(type: Exec) {
workingDir getProjectDir() workingDir getProjectDir()
samples/tensorflow/build.sh
+2 -1
View File
@@ -6,7 +6,8 @@ source "$DIR/../konan.sh"
$DIR/downloadTensorflow.sh $DIR/downloadTensorflow.sh
TF_TARGET_DIRECTORY="$HOME/.konan/third-party/tensorflow" # KONAN_USER_DIR is set by konan.sh
TF_TARGET_DIRECTORY="$KONAN_USER_DIR/third-party/tensorflow"
TF_TYPE="cpu" # Change to "gpu" for GPU support TF_TYPE="cpu" # Change to "gpu" for GPU support
if [ x$TARGET == x ]; then if [ x$TARGET == x ]; then
samples/tensorflow/downloadTensorflow.sh
+2 -1
View File
@@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
TF_TARGET_DIRECTORY="$HOME/.konan/third-party/tensorflow" KONAN_USER_DIR=${KONAN_DATA_DIR:-"$HOME/.konan"}
TF_TARGET_DIRECTORY="$KONAN_USER_DIR/third-party/tensorflow"
TF_TYPE="cpu" # Change to "gpu" for GPU support TF_TYPE="cpu" # Change to "gpu" for GPU support
if [ x$TARGET == x ]; then if [ x$TARGET == x ]; then
samples/tetris/build.bat
+2 -1
View File
@@ -1,7 +1,8 @@
@echo off @echo off
setlocal setlocal
set DIR=. set DIR=.
set "PATH=..\..\dist\bin;..\..\bin;%HOME%\.konan\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%" if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR="%HOME%\.konan")
set "PATH=..\..\dist\bin;..\..\bin;%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64\bin;%PATH%"
if "%TARGET%" == "" set TARGET=mingw if "%TARGET%" == "" set TARGET=mingw
rem Requires default mingw64 install path yet. rem Requires default mingw64 install path yet.
set MINGW=\msys64\mingw64 set MINGW=\msys64\mingw64
samples/tetris/build.gradle
+3 -1
View File
@@ -2,6 +2,8 @@ apply plugin: 'konan'
konan.targets = ['macbook', 'linux', 'raspberrypi'] konan.targets = ['macbook', 'linux', 'raspberrypi']
def konanUserDir = System.getenv("KONAN_DATA_DIR") ?: "${System.getProperty("user.home")}/.konan"
konanArtifacts { konanArtifacts {
interop ('sdl') { interop ('sdl') {
@@ -20,7 +22,7 @@ konanArtifacts {
} }
target 'raspberrypi', { target 'raspberrypi', {
includeDirs "${System.getProperty("user.home")}/.konan/dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2" includeDirs "$konanUserDir/dependencies/target-sysroot-1-raspberrypi/usr/include/SDL2"
} }
} }
samples/tetris/build.sh
+2 -1
View File
@@ -4,7 +4,8 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )
source "$DIR/../konan.sh" source "$DIR/../konan.sh"
DEPS="$HOME/.konan/dependencies" # KONAN_DEPS is set in konan.sh
DEPS="$KONAN_DEPS"
CFLAGS_macbook=-I$HOME/Library/Frameworks/SDL2.framework/Headers CFLAGS_macbook=-I$HOME/Library/Frameworks/SDL2.framework/Headers
LINKER_ARGS_macbook="-F $HOME/Library/Frameworks -framework SDL2" LINKER_ARGS_macbook="-F $HOME/Library/Frameworks -framework SDL2"
samples/torch/README.md
+2 -1
View File
@@ -23,7 +23,8 @@ Now
./downloadTorch.sh ./downloadTorch.sh
will install it into `$HOME/.konan/third-party/torch` (if not yet done). will install it into `$HOME/.konan/third-party/torch` (if not yet done). One may override the location of
`third-party/torch` by setting the `KONAN_DATA_DIR` environment variable.
To build use `../gradlew build` or `./build.sh`. To build use `../gradlew build` or `./build.sh`.
samples/torch/build.gradle
+2 -1
View File
@@ -2,7 +2,8 @@ apply plugin: 'konan'
konan.targets = ['macbook', 'linux'] konan.targets = ['macbook', 'linux']
def torchHome = "${System.getProperty("user.home")}/.konan/third-party/torch" def konanUserDir = System.getenv("KONAN_DATA_DIR") ?: "${System.getProperty("user.home")}/.konan"
def torchHome = "$konanUserDir/third-party/torch"
task downloadTorch(type: Exec) { task downloadTorch(type: Exec) {
workingDir getProjectDir() workingDir getProjectDir()
samples/torch/build.sh
+1 -1
View File
@@ -6,7 +6,7 @@ source "$DIR/../konan.sh"
$DIR/downloadTorch.sh $DIR/downloadTorch.sh
TH_TARGET_DIRECTORY="$HOME/.konan/third-party/torch" TH_TARGET_DIRECTORY="$KONAN_USER_DIR/third-party/torch"
if [ x$TARGET == x ]; then if [ x$TARGET == x ]; then
case "$OSTYPE" in case "$OSTYPE" in
samples/torch/downloadTorch.sh
+2 -1
View File
@@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
TH_TARGET_DIRECTORY=~/.konan/third-party/torch KONAN_USER_DIR=${KONAN_DATA_DIR:-"$HOME/.konan"}
TH_TARGET_DIRECTORY="$KONAN_USER_DIR/third-party/torch"
NO_CUDA=true # set to false for GPU support NO_CUDA=true # set to false for GPU support
if [ ! -d $TH_TARGET_DIRECTORY/include/THNN ]; then if [ ! -d $TH_TARGET_DIRECTORY/include/THNN ]; then
samples/zephyr/build.bat
+2 -2
View File
@@ -6,8 +6,8 @@ set ZEPHYR_BASE=%userprofile%\zephyr
set TOOLCHAIN=gcc-arm-none-eabi-7-2017-q4-major-win32 set TOOLCHAIN=gcc-arm-none-eabi-7-2017-q4-major-win32
set DIR=%~dp0 set DIR=%~dp0
set KONAN_USER_DIR=%userprofile%/.konan if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR="%HOME%\.konan")
set KONAN_DEPS=%KONAN_USER_DIR%/dependencies set KONAN_DEPS=%KONAN_DATA_DIR%/dependencies
set GCC_ARM=%KONAN_DEPS%/%TOOLCHAIN% set GCC_ARM=%KONAN_DEPS%/%TOOLCHAIN%
set ZEPHYR_TOOLCHAIN_VARIANT=gccarmemb set ZEPHYR_TOOLCHAIN_VARIANT=gccarmemb
set GCCARMEMB_TOOLCHAIN_PATH=%GCC_ARM% set GCCARMEMB_TOOLCHAIN_PATH=%GCC_ARM%