Skip to content

fix enzyme library used for build #150

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

Merged
merged 5 commits into from
Aug 2, 2024
Merged

fix enzyme library used for build #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51223a1
fix enzyme library used for build
tgymnich Aug 2, 2024
3da1c14
test
tgymnich Aug 2, 2024
7f472af
Revert "test"
tgymnich Aug 2, 2024
7075807
more fixes
tgymnich Aug 2, 2024
a3286e7
Merge branch 'master' into fix-lib
ZuseZ4 Aug 2, 2024
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
6 changes: 3 additions & 3 deletions src/bootstrap/src/core/build_steps/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,12 +1648,12 @@ impl Step for Assemble {
};

if let Some(enzyme_install) = enzyme_install {
let src_lib = enzyme_install.join("build/Enzyme/LLVMEnzyme-17.so");
let src_lib = enzyme_install.join("build/Enzyme/libEnzyme-17.so");

let libdir = builder.sysroot_libdir(build_compiler, build_compiler.host);
let target_libdir = builder.sysroot_libdir(target_compiler, target_compiler.host);
let dst_lib = libdir.join("libLLVMEnzyme-17.so");
let target_dst_lib = target_libdir.join("libLLVMEnzyme-17.so");
let dst_lib = libdir.join("libEnzyme-17.so");
let target_dst_lib = target_libdir.join("libEnzyme-17.so");
builder.copy(&src_lib, &dst_lib);
builder.copy(&src_lib, &target_dst_lib);
}
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/llvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ impl Step for Enzyme {
.profile(profile)
.env("LLVM_CONFIG_REAL", &llvm_config)
.define("LLVM_ENABLE_ASSERTIONS", "ON")
.define("ENZYME_EXTERNAL_SHARED_LIB", "OFF")
.define("ENZYME_EXTERNAL_SHARED_LIB", "ON")
.define("LLVM_DIR", &llvm_cmake_dir);

cfg.build();
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ impl<'a> Builder<'a> {
// https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/.E2.9C.94.20link.20new.20library.20into.20stage1.2Frustc
if self.config.llvm_enzyme {
rustflags.arg("-l");
rustflags.arg("LLVMEnzyme-17");
rustflags.arg("Enzyme-17");
}

let use_new_symbol_mangling = match self.config.rust_new_symbol_mangling {
Expand Down
Loading