Skip to content
This repository has been archived by the owner on Dec 1, 2021. It is now read-only.

Delete cmake dependency #936

Merged
merged 11 commits into from
Mar 30, 2020
Merged

Delete cmake dependency #936

merged 11 commits into from
Mar 30, 2020
+24 −237

Conversation

tk26eng
Copy link
Contributor

@tk26eng tk26eng commented Mar 19, 2020

What this patch does to fix the issue.

This PR removes dependency for cmake.
Test should be modified to use make instead of cmake.

Link to any relevant issues or pull requests.

Fix #436
Fix #542

@blueoil-butler blueoil-butler bot added the CI: auto-run Run CI automatically label Mar 19, 2020
@bo-code-review-bot
Copy link

This PR needs Approvals as follows.

  • Ownership Approval for / from iizukak, tkng, ruimashita
  • Readability Approval for Python from tkng, tsawada

Please choose reviewers and requet reviews!

Click to see how to approve each reviews

You can approve this PR by triggered comments as follows.

  • Approve all reviews requested to you (readability and ownership) and LGTM review
    Approval, LGTM

  • Approve all ownership reviews
    Ownership Approval or OA

  • Approve all readability reviews
    Readability Approval or RA

  • Approve specified review targets

    • Example of Ownership Reviewer of /: Ownership Approval for / or OA for /
    • Example of Readability Reviewer of Python: Readability Approval for Python or RA for Python

  • Approve LGTM review
    LGTM

See all trigger comments

Please replace [Target] to review target

  • Ownership Approval
    • Ownership Approval for [Target]
    • OA for [Target]
    • Ownership Approval
    • OA
    • Approval
  • Readability Approval
    • Readability Approval for [Target]
    • RA for [Target]
    • [Target] Readability Approval
    • [Target] RA
    • Readability Approval
    • RA
    • Approval
  • LGTM
    • LGTM
    • lgtm

@tk26eng tk26eng self-assigned this Mar 19, 2020
@tk26eng tk26eng requested review from iizukak and tsawada March 19, 2020 06:26
iizukak
iizukak reviewed Mar 23, 2020
View reviewed changes
Copy link
Member

@iizukak iizukak left a comment

Choose a reason for hiding this comment

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

@tk26eng Thanks. Great PR. I put just one comment.

tests/converter/test_code_generation.py Outdated
'x86_64_True':'x86_avx'
}

lib_base_name = cpu_to_lib[cpu_name + '_' + str(use_avx)]
Copy link
Member

Choose a reason for hiding this comment

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

AVX is for x86 only.
Added True and False flag to all CPU architecture looks redundant.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I know AVX flag is redundant for other CPU than x86.
But I used AVX flag for all CPUs to apply cpu_to_lib table to make the code simple.

Is if statement better than translation table ?

Copy link
Member

@iizukak iizukak Mar 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

But I used AVX flag for all CPUs to apply cpu_to_lib table to make the code simple.

Sorry, If my understand of your code is correct, I do not agree with you...
Add "_True" and "_False" to all lines are looks not suitable way.

How about to write like

        cpu_to_lib = {
            'aarch64':'aarch64', 
            'arm':'arm',
            'arm_fpga':'fpga', 
            'x86_64':'x86_avx' if use_avx else 'x86_64',
        }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wanted to remove if statement but I gave it up .
I changed to use if statement instead of table.
Is it OK for you ?

@iizukak
Copy link
Member

iizukak commented Mar 23, 2020

Please set readability reviewer after ownership approval.

@iizukak iizukak removed the request for review from tsawada March 23, 2020 03:34
@tk26eng tk26eng requested a review from iizukak March 23, 2020 10:59
iizukak
iizukak reviewed Mar 24, 2020
View reviewed changes
tests/converter/test_code_generation.py Outdated
check_stderr_block=['error: ']
)

Copy link
Member

Choose a reason for hiding this comment

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

@tk26eng
Sorry for little thing.
We do not change code style fix with other implementation.

tests/converter/test_code_generation.py
@@ -336,9 +336,18 @@ def codegen_cpu(self,
cache_dma=cache_dma,
)

lib_name = 'libdlk_' + cpu_name
if cpu_name == 'arm_fpga':
Copy link
Member

Choose a reason for hiding this comment

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

Thanks. Looks good for me.

@tk26eng tk26eng requested a review from iizukak March 24, 2020 03:17
@tk26eng
Copy link
Contributor Author

tk26eng commented Mar 26, 2020

ping @iizukak

iizukak
iizukak approved these changes Mar 26, 2020
View reviewed changes
Copy link
Member

@iizukak iizukak left a comment

Choose a reason for hiding this comment

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

OA

@iizukak iizukak requested a review from tsawada March 26, 2020 07:31
@tsawada tsawada requested review from tfujiwar and removed request for tsawada March 26, 2020 09:07
tfujiwar
tfujiwar approved these changes Mar 26, 2020
View reviewed changes
Copy link
Contributor

@tfujiwar tfujiwar left a comment

Choose a reason for hiding this comment

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

Readability Approval (reverse-shadowing)
I left 1 small comment!

@tk26eng
Copy link
Contributor Author

tk26eng commented Mar 30, 2020

/ready

@bo-mergebot
Copy link
Contributor

bo-mergebot bot commented Mar 30, 2020

⏳Merge job is queued...

@bo-mergebot
Copy link
Contributor

bo-mergebot bot commented Mar 30, 2020

😥This PR is not approved yet.

@tk26eng tk26eng requested a review from tfujiwar March 30, 2020 06:32
tfujiwar
tfujiwar approved these changes Mar 30, 2020
View reviewed changes
Copy link
Contributor

@tfujiwar tfujiwar left a comment

Choose a reason for hiding this comment

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

Readability Approval
Thank you!!

@tfujiwar
Copy link
Contributor

/ready

@bo-mergebot
Copy link
Contributor

bo-mergebot bot commented Mar 30, 2020

⏳Merge job is queued...

@bo-mergebot bo-mergebot bot merged commit 9d454ad into blue-oil:master Mar 30, 2020
oatawa1 pushed a commit to oatawa1/blueoil that referenced this pull request Mar 31, 2020
@tk26eng @oatawa1
Delete cmake dependency (blue-oil#936)
042f4e6
oatawa1 pushed a commit to oatawa1/blueoil that referenced this pull request Mar 31, 2020
@tk26eng @oatawa1
Delete cmake dependency (blue-oil#936)
034e34f
@tk26eng tk26eng deleted the delete_cmake branch April 16, 2020 01:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@iizukak iizukak iizukak approved these changes

@tfujiwar tfujiwar tfujiwar approved these changes

Assignees

@tk26eng tk26eng

Labels
CI: auto-run Run CI automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Choose make or cmake to maintaine for DLK Unify dlk build system
3 participants
@tk26eng @iizukak @tfujiwar