Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Change size_t to int within for loop to fix windows build error #14740

Merged
merged 2 commits into from
Apr 21, 2019

Conversation

ciyongch
Copy link
Contributor

Description

This patch is to fix the build error of using "size_t" within for loop on Windows Platform, since MSVC only support OpenMP 2.0 standard, which will cause the "error C3016: 'i' : index variable in OpenMP 'for' statement must have signed integral type".

@pengzhao-intel @TaoLv

Checklist

Essentials

Please feel free to remove inapplicable items for your PR.

  • The PR title starts with [MXNET-$JIRA_ID], where $JIRA_ID refers to the relevant JIRA issue created (except PRs with tiny changes)
  • Changes are complete (i.e. I finished coding on this PR)
  • All changes have test coverage:
  • Unit tests are added for small changes to verify correctness (e.g. adding a new operator)
  • Nightly tests are added for complicated/long-running ones (e.g. changing distributed kvstore)
  • Build tests will be added for build configuration changes (e.g. adding a new build option with NCCL)
  • Code is well-documented:
  • For user-facing API changes, API doc string has been updated.
  • For new C++ functions in header files, their functionalities and arguments are documented.
  • For new examples, README.md is added to explain the what the example does, the source of the dataset, expected performance on test set and reference to the original paper if applicable
  • Check the API doc at http:https://mxnet-ci-doc.s3-accelerate.dualstack.amazonaws.com/PR-$PR_ID/$BUILD_ID/index.html
  • To the my best knowledge, examples are either not affected by this change, or have been fixed to be compatible with this change

Changes

  • Feature1, tests, (and when applicable, API doc)
  • Feature2, tests, (and when applicable, API doc)

Comments

  • If this change is a backward incompatible change, why must this change be made.
  • Interesting edge cases to note here

Copy link
Member

@wkcn wkcn left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you for the fix!

@apeforest
Copy link
Contributor

Are these the only changes needed to fix the windows build error? I thought there are more for loops with size_t as index in the code.

@@ -156,7 +156,7 @@ void SgMKLDNNFCOp::Forward(const OpContext &ctx,
int32_t *quantized_bias_ptr = cached_bias_.data().dptr<int32_t>();
size_t bias_size = bias.shape().Size();
#pragma omp parallel for num_threads(engine::OpenMP::Get()->GetRecommendedOMPThreadCount())
for (size_t i = 0; i < bias_size; ++i) {
for (int i = 0; i < static_cast<int>(bias_size); ++i) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the static_cat from size_t to int safety if the value of bias_size is large than the range of int?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Already changed to index_t.

@TaoLv
Copy link
Member

TaoLv commented Apr 19, 2019

@apeforest That are the only two cases we found in local. There were other places reported in #14203 . I think some of them have already been fixed via other PRs.

@TaoLv
Copy link
Member

TaoLv commented Apr 19, 2019

Thank you for the fix. @yinghu5 You may be interested.

@TaoLv TaoLv mentioned this pull request Apr 19, 2019
5 tasks
@Roshrini Roshrini added the pr-awaiting-review PR is waiting for code review label Apr 19, 2019
Copy link
Contributor

@apeforest apeforest left a comment

Choose a reason for hiding this comment

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

LGTM

@TaoLv
Copy link
Member

TaoLv commented Apr 21, 2019

Thank you for the contribution @ciyongch. It's now merged.

@TaoLv TaoLv merged commit 100586a into apache:master Apr 21, 2019
haohuanw pushed a commit to haohuanw/incubator-mxnet that referenced this pull request Jun 23, 2019
…he#14740)

* change size_t to int for supporting OpenMp 2.0 windows build

* change int to index_t
@ciyongch ciyongch deleted the openmp_2.0_win_support branch July 15, 2019 06:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pr-awaiting-review PR is waiting for code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants