HuwCampbell/grenade
1
1
Fork 0
mirror of https://github.com/HuwCampbell/grenade.git synced 2024-11-22 06:55:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from erikd/master

Browse Source 
Couple of minor fixes
This commit is contained in:
Huw Campbell 2016-06-28 22:33:49 +10:00 committed by GitHub
commit b8e0450cbd
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitmodules vendored
View File

@ -1,15 +1,15 @@
[submodule "lib/disorder"]
path = lib/disorder
url = git@github.com:ambiata/disorder.hs
url = https://github.com/ambiata/disorder.hs
[submodule "lib/x"]
path = lib/x
url = git@github.com:ambiata/x.git
url = https://github.com/ambiata/x.git
[submodule "lib/p"]
path = lib/p
url = git@github.com:ambiata/p.git
url = https://github.com/ambiata/p.git
[submodule "lib/disorder.hs"]
path = lib/disorder.hs
url = git@github.com:ambiata/disorder.hs.git
url = https://github.com/ambiata/disorder.hs.git
[submodule "lib/hmatrix"]
path = lib/hmatrix
url = git@github.com:albertoruiz/hmatrix.git
url = https://github.com/albertoruiz/hmatrix.git

10
grenade.cabal
View File

@ -1,6 +1,6 @@
name: grenade
version: 0.0.1
license: BSD
license: BSD2
author: Huw Campbell <huw.campbell@gmail.com>
maintainer: Huw Campbell <huw.campbell@gmail.com>
copyright: (c) 2015 Huw Campbell.
@ -21,7 +21,7 @@ library
, mtl >= 2.2.1 && < 2.3
, parallel == 3.2.*
, primitive
, text >= 1.2
, text == 1.2.*
, transformers
, singletons
@ -57,7 +57,7 @@ executable feedforward
, attoparsec
, either
, optparse-applicative == 0.12.*
, text
, text == 1.2.*
, mtl >= 2.2.1 && < 2.3
, hmatrix
, transformers
@ -72,7 +72,7 @@ executable mnist
, attoparsec
, either
, optparse-applicative == 0.12.*
, text
, text == 1.2.*
, mtl >= 2.2.1 && < 2.3
, hmatrix
, transformers
@ -96,6 +96,6 @@ test-suite test
, ambiata-disorder-core
, hmatrix
, mtl
, text
, text == 1.2.*
, QuickCheck == 2.7.*
, quickcheck-instances == 0.3.*

16
mafia
View File

@ -67,11 +67,9 @@ exec_mafia () {
# Create a temporary file in MAFIA_BIN so we can do an atomic copy/move dance.
mkdir -p $MAFIA_BIN
MAFIA_PATH_TEMP=$(mktemp --tmpdir=$MAFIA_BIN $MAFIA_FILE-XXXXXX 2>/dev/null || TMPDIR=$MAFIA_BIN mktemp -t $MAFIA_FILE)
clean_up () {
rm -rf "$MAFIA_TEMP"
rm -f "$MAFIA_PATH_TEMP"
}
trap clean_up EXIT
@ -87,9 +85,19 @@ exec_mafia () {
bin/bootstrap ) || exit $?
MAFIA_PATH_TEMP=$(mktemp --tmpdir=$MAFIA_BIN $MAFIA_FILE-XXXXXX 2>/dev/null || TMPDIR=$MAFIA_BIN mktemp -t $MAFIA_FILE)
clean_up_temp () {
clean_up
rm -f "$MAFIA_PATH_TEMP"
}
trap clean_up_temp EXIT
cp "$MAFIA_TEMP/mafia/.cabal-sandbox/bin/mafia" "$MAFIA_PATH_TEMP"
chmod +x "$MAFIA_PATH_TEMP"
chmod 755 "$MAFIA_PATH_TEMP"
mv "$MAFIA_PATH_TEMP" "$MAFIA_PATH"
clean_up_temp
}
exec $MAFIA_PATH "$@"
@ -110,4 +118,4 @@ case "$MODE" in
upgrade) shift; run_upgrade "$@" ;;
*) exec_mafia "$@"
esac
# Version: d64cd4f4ab42c1431752d7c84e355b7d001778f8
# Version: dbbe635d8f98be1815130f04465c155f414985bf