Skip to content
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

Jump to bottom

Support Apple Silicon #9

Merged
merged 6 commits into from
Sep 23, 2021
Merged

Support Apple Silicon #9

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4202ea2
Add --config=macos_arm64 when running on M1
jonatanklosko Sep 23, 2021
fa034e2
Update genrule cmd
jonatanklosko Sep 23, 2021
cf70361
Bump Tensorflow
jonatanklosko Sep 23, 2021
b652258
Update changelog and readme
jonatanklosko Sep 23, 2021
94e3236
Update readme
jonatanklosko Sep 23, 2021
cdb1ab0
Fix build path when compiling locally
jonatanklosko Sep 23, 2021
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
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ BUILD_MODE ?= opt # can also be dbg
BUILD_CACHE ?= $(TEMP)/xla_extension
TENSORFLOW_GIT_REPO ?= https://github.com/tensorflow/tensorflow.git

# TODO: Should this instead be a stable version source?
# e.g. instead use wget to download tagged releases
TENSORFLOW_GIT_REV ?= 54dee6dd8d47b6e597f4d3f85b6fb43fd5f50f82
# Tensorflow 2.6.0
TENSORFLOW_GIT_REV ?= 919f693420e35d00c8d0a42100837ae3718f7927

# Private configuration
BAZEL_FLAGS = --define "framework_shared_object=false" -c $(BUILD_MODE)
Expand Down
5 changes: 2 additions & 3 deletions Makefile.win
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ BUILD_CACHE=$(TEMP)/xla_extension
TENSORFLOW_GIT_REPO=https://github.com/tensorflow/tensorflow.git
!ENDIF

# TODO: Should this instead be a stable version source?
# e.g. instead use wget to download tagged releases
!IFNDEF TENSORFLOW_GIT_REV
TENSORFLOW_GIT_REV=54dee6dd8d47b6e597f4d3f85b6fb43fd5f50f82
# Tensorflow 2.6.0
TENSORFLOW_GIT_REV=919f693420e35d00c8d0a42100837ae3718f7927
!ENDIF

# Private configuration
Expand Down
8 changes: 4 additions & 4 deletions extension/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ genrule(
d="$${d#*external/$${extname}/}"
fi
# Remap llvm paths
d="$${d/llvm\/include\/llvm/llvm}"
d="$${d/llvm\/include\/llvm-c/llvm-c}"
d="$${d/llvm\\/include\\/llvm/llvm}"
d="$${d/llvm\\/include\\/llvm-c/llvm-c}"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seanmor5 my hypothesis is that the escape in \/ would be first interpreted by Bazel and for bazel \/ would be an invalid escape. On the other hand \\ would be a valid escape and appear as \ in the actual script.

# Remap google path
d="$${d/src\/google/google}"
d="$${d/src\\/google/google}"
# Remap grpc paths
d="$${d/include\/grpc/grpc}"
d="$${d/include\\/grpc/grpc}"
mkdir -p "$@/$${d}"
cp "$${f}" "$@/$${d}/"
done
Expand Down
42 changes: 26 additions & 16 deletions lib/xla.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,22 @@ defmodule XLA do

@doc false
def make_env() do
bazel_build_flags =
bazel_build_flags_accelerator =
case xla_target() do
"cuda" <> _ -> "--config=cuda"
"rocm" <> _ -> "--config=rocm --action_env=HIP_PLATFORM=hcc"
"tpu" <> _ -> "--config=tpu"
_ -> ""
"cuda" <> _ -> ["--config=cuda"]
"rocm" <> _ -> ["--config=rocm", "--action_env=HIP_PLATFORM=hcc"]
"tpu" <> _ -> ["--config=tpu"]
_ -> []
end

bazel_build_flags_cpu =
case cpu_and_os() do
{"aarch64", "darwin"} -> ["--config=macos_arm64"]
_ -> []
end

bazel_build_flags = Enum.join(bazel_build_flags_accelerator ++ bazel_build_flags_cpu, " ")

# Additional environment variables passed to make
%{
"BUILD_INTERNAL_FLAGS" => bazel_build_flags,
Expand All @@ -90,20 +98,22 @@ defmodule XLA do
end

defp target() do
{cpu, os} =
:erlang.system_info(:system_architecture)
|> List.to_string()
|> String.split("-")
|> case do
["arm" <> _, _vendor, "darwin" <> _ | _] -> {"aarch64", "darwin"}
[cpu, _vendor, "darwin" <> _ | _] -> {cpu, "darwin"}
[cpu, _vendor, os | _] -> {cpu, os}
["win32"] -> {"x86_64", "windows"}
end

{cpu, os} = cpu_and_os()
"#{cpu}-#{os}-#{xla_target()}"
end

defp cpu_and_os() do
:erlang.system_info(:system_architecture)
|> List.to_string()
|> String.split("-")
|> case do
["arm" <> _, _vendor, "darwin" <> _ | _] -> {"aarch64", "darwin"}
[cpu, _vendor, "darwin" <> _ | _] -> {cpu, "darwin"}
[cpu, _vendor, os | _] -> {cpu, os}
["win32"] -> {"x86_64", "windows"}
end
end

defp archive_path_for_build() do
filename = archive_filename_with_target()
cache_path(["build", filename])
Expand Down