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.

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

build: Fix build under intel mac machine #5447

Merged
merged 1 commit into from
Jul 21, 2022
Merged

Conversation

JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Jul 21, 2022

What problem does this PR solve?

Issue Number: ref #5368

Problem Summary:
cpu_features is not added as a subdirectory under intel mac

What is changed and how it works?

Due to cmake condition

# test CMake if condition
>  cat CMakeLists.txt
project(test)

set(ARCH_AARCH64 0)
set(ARCH_AMD64 1)
set(APPLE 1)

if ((NOT APPLE))
    message(STATUS "    not apple -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
else()
    message(STATUS "        apple -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
endif()

if ((NOT ARCH_AARCH64))
    message(STATUS "    not arm64 -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
else()
    message(STATUS "        arm64 -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
endif()

if (APPLE AND ARCH_AARCH64)
    message(STATUS "     apple and arm64  -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
else()
    message(STATUS "not (apple and arm64) -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
endif()

if ((NOT APPLE) AND (NOT ARCH_AARCH64))
    message(STATUS "not (apple and arm64) -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
else()
    message(STATUS "     apple and arm64  -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
endif()

if (NOT (APPLE AND ARCH_AARCH64))
    message(STATUS "not (apple and arm64) -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
else()
    message(STATUS "     apple and arm64  -- APPLE:${APPLE} ARCH_AARCH64:${ARCH_AARCH64}")
endif()
>  cmake .
--         apple -- APPLE:1 ARCH_AARCH64:0
--     not arm64 -- APPLE:1 ARCH_AARCH64:0
-- not (apple and arm64) -- APPLE:1 ARCH_AARCH64:0
--      apple and arm64  -- APPLE:1 ARCH_AARCH64:0
-- not (apple and arm64) -- APPLE:1 ARCH_AARCH64:0
-- Configuring done
-- Generating done
-- Build files have been written to: /test

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    • build under an intel imac
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 21, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • LittleFall
  • zanmato1984

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Jul 21, 2022
@JaySon-Huang
Copy link
Contributor Author

/run-all-tests

Copy link
Contributor

@zanmato1984 zanmato1984 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 21, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 21, 2022
@JaySon-Huang
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@JaySon-Huang: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 6330907

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 21, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Jul 21, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18780      9450             49.68%    213985  95498        55.37%

full coverage report (for internal network access only)

@JaySon-Huang
Copy link
Contributor Author

/run-integration-test

@ti-chi-bot ti-chi-bot merged commit c2e9f96 into master Jul 21, 2022
@JaySon-Huang JaySon-Huang deleted the JaySon-Huang-patch-1 branch July 21, 2022 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants