Skip to content

Homogenize config #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Homogenize config #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions framework/delite-test/src/ppl/tests/scalatest/DeliteSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,17 @@ trait DeliteTestConfig {
// something arbitrary that we should never see in any test's output
val MAGICDELIMETER = "!~x02$758209"

val propFile = new File("delite.properties")
val props = new java.util.Properties(System.getProperties)
if (propFile.exists) props.load(new FileReader(propFile))

// test parameters
val verbose = props.getProperty("tests.verbose", "false") != "false"
val verboseDefs = props.getProperty("tests.verboseDefs", "false") != "false"
val threads = props.getProperty("tests.threads", "1").split(",").map(_.toInt)
val cacheSyms = props.getProperty("tests.cacheSyms", "true").toBoolean
val javaHome = new File(props.getProperty("java.home", ""))
val scalaHome = new File(props.getProperty("scala.vanilla.home", ""))
val runtimeClasses = new File(props.getProperty("runtime.classes", ""))
val verbose = Config.getProperty("tests.verbose", "false") != "false"
val verboseDefs = Config.getProperty("tests.verboseDefs", "false") != "false"
val threads = Config.getProperty("tests.threads", "1").split(",").map(_.toInt)
val cacheSyms = Config.getProperty("tests.cacheSyms", "true").toBoolean
val javaHome = new File(Config.getProperty("java.home", ""))
val scalaHome = new File(Config.getProperty("scala.vanilla.home", ""))
val runtimeClasses = new File(Config.getProperty("runtime.classes", ""))
val runtimeExternalProc = false // javaHome, scalaHome and runtimeClasses only required if runtimeExternalProc is true. should this be configurable? or should we just remove execTestExternal?
val deliteTestTargets = props.getProperty("tests.targets", "scala").split(",")
val useBlas = props.getProperty("tests.extern.blas", "false").toBoolean
val deliteTestTargets = Config.getProperty("tests.targets", "scala").split(",")
val useBlas = Config.getProperty("tests.extern.blas", "false").toBoolean

var cppWhiteList = Seq("StaticData", "DeliteTestMkString", "DeliteTestAppend", "DeliteTestStrConcat", "DeliteTestFwNew", //test operations are Scala-only by design
"DeliteTestBwNew", "DeliteTestBwWrite", "DeliteTestBwClose", "DeliteTestPrintLn", "scala.collection.mutable.ArrayBuffer",
Expand Down
13 changes: 10 additions & 3 deletions framework/src/ppl/delite/framework/Config.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
package ppl.delite.framework

import java.io.File
import java.io.FileReader

object Config {

private def getProperty(prop: String, default: String) = {
val p1 = System.getProperty(prop)
val p2 = System.getProperty(prop.substring(1))
private val propFile = new File("delite.properties")
private val props = new java.util.Properties(System.getProperties)
if (propFile.exists) props.load(new FileReader(propFile))

def getProperty(prop: String, default: String) = {
val p1 = props.getProperty(prop)
val p2 = props.getProperty(prop.substring(1))
if (p1 != null && p2 != null) {
assert(p1 == p2, "ERROR: conflicting properties")
p1
Expand Down