Skip to content

Commit 9e2cd04

Browse files
fix: exla rpath (#1553)
Co-authored-by: José Valim <[email protected]>
1 parent c5a23ab commit 9e2cd04

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

exla/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ XLA_EXTENSION_LIB = $(XLA_EXTENSION_DIR)/lib
88
XLA_INCLUDE_PATH = $(XLA_EXTENSION_DIR)/include
99

1010
# Cache configuration
11-
EXLA_CACHE_SO = cache/$(EXLA_VERSION)/libexla.so
11+
EXLA_CACHE_SO = cache/libexla.so
1212
EXLA_CACHE_OBJ_DIR = cache/$(EXLA_VERSION)/objs
1313

1414
# Private configuration

exla/mix.exs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,22 @@ defmodule EXLA.MixProject do
135135
end
136136

137137
defp cached_make(args) do
138-
force_rebuild_mode =
139-
case System.get_env("EXLA_FORCE_REBUILD", "") do
140-
"" ->
141-
:none
138+
force_rebuild_env_var = System.get_env("EXLA_FORCE_REBUILD", "")
142139

143-
"0" ->
140+
force_rebuild_mode =
141+
cond do
142+
force_rebuild_env_var in ["", "false", "0"] ->
144143
:none
145144

146-
"partial" ->
145+
force_rebuild_env_var == "partial" ->
147146
:partial
148147

149-
"true" ->
150-
:full
151-
152-
"1" ->
148+
force_rebuild_env_var in ["true", "1"] ->
153149
:full
154150

155-
value ->
151+
true ->
156152
Mix.raise(
157-
"invalid value for EXLA_FORCE_REBUILD: '#{value}'. Expected one of: partial, true"
153+
"invalid value for EXLA_FORCE_REBUILD: '#{force_rebuild_env_var}'. Expected one of: partial, true, false"
158154
)
159155
end
160156

@@ -183,24 +179,24 @@ defmodule EXLA.MixProject do
183179
cached? = File.exists?(cached_so) and force_rebuild_mode == :none
184180

185181
if force_rebuild_mode in [:partial, :full] do
186-
Mix.shell().info("Removing cached libexla.so file in cache/#{@version}/libexla.so")
187-
File.rm_rf!("cache/#{@version}/libexla.so")
182+
Mix.shell().info("Removing cached libexla.so file in cache/libexla.so")
183+
File.rm_rf!("cache/libexla.so")
188184

189185
Mix.shell().info("Removing libexla.so cache at #{cached_so}")
190186
File.rm_rf!(cached_so)
191187
end
192188

193189
if cached? do
194190
Mix.shell().info("Using libexla.so from #{cached_so}")
195-
File.cp!(cached_so, "cache/#{@version}/libexla.so")
191+
File.cp!(cached_so, "cache/libexla.so")
196192
end
197193

198194
result = Mix.Tasks.Compile.ElixirMake.run(args)
199195

200196
if not cached? and match?({:ok, _}, result) do
201197
Mix.shell().info("Caching libexla.so at #{cached_so}")
202198
File.mkdir_p!(Path.dirname(cached_so))
203-
File.cp!("cache/#{@version}/libexla.so", cached_so)
199+
File.cp!("cache/libexla.so", cached_so)
204200
end
205201

206202
result

0 commit comments

Comments
 (0)