Hotfix for version reporting.

niessner · Oct 22, 2017 · eed03b9 · eed03b9
1 parent 512fa1a
commit eed03b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/API/src/createwrapper.t b/API/src/createwrapper.t
@@ -1,8 +1,6 @@
 local libraryname, sourcedirectory, main, headerfile, outputname, embedsource = ...
 embedsource = "true" == embedsource or false
 
-require("version")
-
 local ffi = require("ffi")
 
 terralib.includepath = terralib.terrahome.."/include;."
@@ -140,10 +138,6 @@ local terra NewState(params : Opt_InitializationParameters) : &LibraryState
     C.lua_pushnumber(L,verbosityLevel);
     C.lua_setfield(L,LUA_GLOBALSINDEX,"_opt_verbosity")
 
-    if params.verbosityLevel > 0 then
-        C.printf("Opt Version: %s\n", [opt_version_string])
-    end
-
     C.lua_pushboolean(L,params.collectPerKernelTimingInfo);
     C.lua_setfield(L,LUA_GLOBALSINDEX,"_opt_collect_kernel_timing")
 

diff --git a/API/src/o.t b/API/src/o.t
@@ -4,6 +4,7 @@ local ffi = require("ffi")
 local util = require("util")
 local optlib = require("lib")
 ad = require("ad")
+require("version")
 require("precision")
 local A = ad.classes
 
@@ -33,6 +34,10 @@ local verboseAD 	= _opt_verbosity > 1
 local vprintfname = ffi.os == "Windows" and "vprintf" or "cudart:vprintf"
 local vprintf = terralib.externfunction(vprintfname, {&int8,&int8} -> int)
 
+if verboseSolver then
+    print("Using Opt "..opt_version_string)
+end
+
 local function createbuffer(args)
     local Buf = terralib.types.newstruct()
     for i,e in ipairs(args) do

diff --git a/API/src/version.t b/API/src/version.t
@@ -2,4 +2,4 @@
 opt_version_major = 0
 opt_version_minor = 1
 opt_version_patch = 0
-opt_version_string = tostring(opt_version_major).."."..tostring(opt_version_patch).."."..tostring(opt_version)
+opt_version_string = "v"..tostring(opt_version_major).."."..tostring(opt_version_minor).."."..tostring(opt_version_patch)