From 83d109c28269e72adf1136d1a6c0e9cb221e67dc Mon Sep 17 00:00:00 2001 From: Person Date: Mon, 13 May 2019 15:46:36 -0700 Subject: [PATCH 1/2] --Code changes -Remove some debug printing. --- Source/Ember/XmlToEmber.cpp | 8 ++++---- archive/build_linux.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Ember/XmlToEmber.cpp b/Source/Ember/XmlToEmber.cpp index 4ad1f68..bcbe2ac 100644 --- a/Source/Ember/XmlToEmber.cpp +++ b/Source/Ember/XmlToEmber.cpp @@ -1634,7 +1634,7 @@ bool XmlToEmber::ParseEmberElement(xmlNode* emberNode, Ember& currentEmber } else if (!Compare(curAtt->name, "overall_curve")) { - cout << "found overall curves\n"; + //cout << "found overall curves\n"; auto splits = Split(attStr, ' '); istringstream is(attStr); vector vals; @@ -1657,7 +1657,7 @@ bool XmlToEmber::ParseEmberElement(xmlNode* emberNode, Ember& currentEmber } else if (!Compare(curAtt->name, "red_curve")) { - cout << "found red curves\n"; + //cout << "found red curves\n"; auto splits = Split(attStr, ' '); istringstream is(attStr); vector vals; @@ -1680,7 +1680,7 @@ bool XmlToEmber::ParseEmberElement(xmlNode* emberNode, Ember& currentEmber } else if (!Compare(curAtt->name, "green_curve")) { - cout << "found green curves\n"; + //cout << "found green curves\n"; auto splits = Split(attStr, ' '); istringstream is(attStr); vector vals; @@ -1703,7 +1703,7 @@ bool XmlToEmber::ParseEmberElement(xmlNode* emberNode, Ember& currentEmber } else if (!Compare(curAtt->name, "blue_curve")) { - cout << "found blue curves\n"; + //cout << "found blue curves\n"; auto splits = Split(attStr, ' '); istringstream is(attStr); vector vals; diff --git a/archive/build_linux.sh b/archive/build_linux.sh index 213f3e6..3ed93fe 100755 --- a/archive/build_linux.sh +++ b/archive/build_linux.sh @@ -11,7 +11,7 @@ FRACTORIUM_PACKAGE=$BUILD_PATH/../Bin/Fractorium FRACTORIUM_RPM_PACKAGE=$BUILD_PATH/../Bin/rpmbuild EXTRA_LIBS=/usr/lib/x86_64-linux-gnu -# replace 5.12.2 by your QT version, and check if the instation path is the same +# replace 5.12.2 by your QT version, and check if the bin path is the same QT_PATH=/home/$USER/Dev/Qt/5.11.2/gcc_64/bin LINUX_DEPLOY_QT=/home/$USER/Dev/linuxdeployqt-6-x86_64.AppImage From ca27ae1eb7b2e3534c58f74cbd3c9386e7255e62 Mon Sep 17 00:00:00 2001 From: Person Date: Mon, 13 May 2019 17:12:24 -0700 Subject: [PATCH 2/2] --Code changes -Get EmberBench.ps1 working on linux. --- Data/Bench/EmberBench.ps1 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Data/Bench/EmberBench.ps1 b/Data/Bench/EmberBench.ps1 index 9e3753b..a06e93b 100644 --- a/Data/Bench/EmberBench.ps1 +++ b/Data/Bench/EmberBench.ps1 @@ -1,5 +1,7 @@ -$exe = ".\EmberRender.exe" -$benchprefix = ".\Bench\" +$exe = "./EmberRender.exe" +#On linux do this: +#$exe = "emberrender" +$benchprefix = "./Bench/" $devices = "2"#Set this to whatever device index your main GPU resides at. If you are unsure, just run emberrender --opencl info to find out. $cpuquality = 150 $gpuquality = 2000 @@ -7,8 +9,8 @@ $verbose = "--verbose" $name_enable = "--name_enable" $dump_args = ""#"--dumpargs" $totalOutput = "" -$ssArray = @(“1”,”2”,”4”) -$ssSuffixArray = @(“_ss1”,”_ss2”,”_ss4”) +$ssArray = @("1","2","4") +$ssSuffixArray = @("_ss1","_ss2","_ss4") $Script:output = "" [Collections.Generic.List[String]] $filteredLines = ""