Skip to content

Commit

Permalink
Merge branch 'main' into warnings-and-clang-tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
MattBolitho authored Oct 19, 2024
2 parents 5f09d3e + 73b7810 commit 7d4b4ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions enzyme/Enzyme/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,20 +206,18 @@ install(TARGETS ClangEnzymeFlags EXPORT EnzymeTargets)
install(TARGETS LLVMEnzyme-${LLVM_VERSION_MAJOR}
EXPORT EnzymeTargets
LIBRARY DESTINATION lib COMPONENT shlib
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/Enzyme"
COMPONENT dev)

if (${Clang_FOUND})
install(TARGETS ClangEnzyme-${LLVM_VERSION_MAJOR}
EXPORT EnzymeTargets
LIBRARY DESTINATION lib COMPONENT shlib
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/Enzyme"
COMPONENT dev)
install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/enzyme" DESTINATION "include")
endif()
install(TARGETS LLDEnzyme-${LLVM_VERSION_MAJOR}
EXPORT EnzymeTargets
LIBRARY DESTINATION lib COMPONENT shlib
PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/Enzyme"
COMPONENT dev)

if (ENZYME_MLIR)
Expand Down
2 changes: 1 addition & 1 deletion enzyme/tools/enzyme-tblgen/blasDeclUpdater.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ inline void emit_attributeBLAS(const TGPattern &pattern, raw_ostream &os) {
}
os << " if (!cublas && !cblas) {\n";
for (int i = 0; i < numChars; i++) {
os << " if (prevFT->getNumParams() >= argTys.size())";
os << " if (prevFT->getNumParams() > argTys.size())";
os << " argTys.push_back(prevFT->getParamType(argTys.size()));\n";
os << " else";
os << " argTys.push_back(blas.intType(F->getContext()));\n";
Expand Down

0 comments on commit 7d4b4ba

Please sign in to comment.