no lib prefix

antonysigma · Jul 18, 2024 · b293d8d · b293d8d
1 parent 1eccb0d
commit b293d8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/proximal/halide/meson.build b/proximal/halide/meson.build
@@ -126,7 +126,10 @@ if get_option('build_nlm')
 endif
 
 if build_machine.system() == 'windows'
-    env = { 'PATH': halide_toolchain.get_variable('halide_dll_path')}
+    env = { 'PATH': [
+        halide_toolchain.get_variable('halide_dll_path'),
+        halide_library_path,
+    ]}
     object_file_ext = 'obj'
     statlib_file_ext = 'lib'
     dynamiclib_file_ext = 'dll'
@@ -162,7 +165,7 @@ foreach p : pipeline_name
     elif p['autoschedule']
         compile_cmd += [
             'target=host',
-            '-p', '@0@/libautoschedule_mullapudi2016.@1@'.format(halide_library_path, dynamiclib_file_ext),
+            '-p', 'autoschedule_mullapudi2016',
             'autoscheduler=Mullapudi2016',
             # Maximum level of CPU core, or GPU threads available
             'autoscheduler.parallelism=4',

diff --git a/proximal/halide/src/user-problem/meson.build b/proximal/halide/src/user-problem/meson.build
@@ -41,11 +41,11 @@ solver_bin = custom_target(
         '-e', 'static_library,h',
         'target=' + halide_target,
 
-        #'-p', '@0@/libautoschedule_mullapudi2016.@1@'.format(halide_library_path, dynamiclib_file_ext),
-        #'autoscheduler=Mullapudi2016',
-        #'autoscheduler.parallelism=4',
-        #'autoscheduler.last_level_cache_size=6291000',
-        #'autoscheduler.balance=40',
+        '-p', '@0@/libautoschedule_mullapudi2016.@1@'.format(halide_library_path, dynamiclib_file_ext),
+        'autoscheduler=Mullapudi2016',
+        'autoscheduler.parallelism=4',
+        'autoscheduler.last_level_cache_size=6291000',
+        'autoscheduler.balance=40',
 
         'n_iter=1',     # number of ADMM iterations before checking convergence
         'mu=0.333',     # Problem scaling factor. Defaults to 1 / sqrt( || K || ).