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

fix windows linkage problem with dllexport #357

Merged
merged 6 commits into from
Oct 22, 2015
Merged

Conversation

hjk41
Copy link
Contributor

@hjk41 hjk41 commented Oct 22, 2015

No description provided.

#define MXNET_API __declspec(dllimport)
#endif
#else
#define MXAPI
Copy link
Member

Choose a reason for hiding this comment

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

change to MXNET_API

tqchen added a commit that referenced this pull request Oct 22, 2015
fix windows linkage problem with dllexport
@tqchen tqchen merged commit 3e91cc9 into apache:master Oct 22, 2015
anirudh2290 pushed a commit to anirudh2290/mxnet that referenced this pull request Mar 9, 2018
iblislin added a commit to iblislin/incubator-mxnet that referenced this pull request Mar 18, 2018
Ref: apache#353

- and handle the case of integer NDArray divided by zero
eric-haibin-lin pushed a commit to eric-haibin-lin/mxnet that referenced this pull request Apr 4, 2018
* Updated TVM version. Implemented fix for nnvm_compiler crash on exit on windows. Changed TOPI ops from using python to using C++ where applicable.

* Fix lint

* Fix lint

* Fix macro

* Fix reshape

* Update TVM to fix test fails
jens-mueller-sociomantic added a commit to jens-mueller-sociomantic/mxnet that referenced this pull request Apr 10, 2019
https://github.com/apache/incubator-mxnet/releases/tag/1.3.1

This updates to MXNet 1.3.1. We are skipping 1.2.x because they
indirectly reference missing commits. The update to 1.3.0 is skipped
because there is already the patched version 1.3.1 available.

The conflicts in `.gitmodules` are manually resolved to keep our
beaver and makd dependencies. For all other conflicts their version was
picked all the time.

To see our changes with respect to upstream MXNet diff against the MXNet
1.3.1 tag, i.e., `git diff 1.3.1..HEAD`.

* 3rdparty/dmlc-core e9446f5(e9446f5)...0a0e8ad(0a0e8ad) (41 commits)
  > Add OMPException class and use it for Text Parser (apache#445)
  > Fix build problem on windows (apache#450)
  > switch to safe_load for kubernetes config load (apache#449)
  > Add S3_IS_AWS env and fixed non-AWS behavior (apache#444)
  > add error message for s3 list (apache#439)
  (...)

* 3rdparty/mkldnn 0e7ca738(0e7ca738)...0e7ca738(0e7ca738) (99 commits)
  > build: bumped version to v0.14 in readme
  > build: bumped version to v0.14
  > cpu: reorder: start using jit uni for 8x8 transposition
  > cpu: reorder: jit uni: add 8x8 kernel
  > cpu: reorder: enable jit uni reorder
  (...)

* 3rdparty/mshadow a8c650c(a8c650c)...8a9e337(8a9e337) (9 commits)
  > Merge pull request apache#358 from eric-haibin-lin/revert
  > Merge pull request apache#357 from azai91/revert/d68d3
  > Merge pull request apache#356 from szha/omp
  > Add half_t support for batch_dot.  (apache#353)
  > Allow large array operation in MXNet (apache#348)
  (...)

* 3rdparty/onnx-tensorrt ()...3d8ee04(3d8ee04) (1 commits)
  > Refactor onnxGetBackendInfo (apache#39)

* 3rdparty/ps-lite v1+144(a6dda54)...v1+146(8a76389) (1 commits)
  > Merge pull request apache#133 from CodingCat/turn_up_down

* 3rdparty/tvm v0.3+434(90db723)d...v0.3+434(90db723)d (1 commits)
  > [FRONTEND] A Python hybrid frontend (apache#1251)
jens-mueller-sociomantic added a commit to jens-mueller-sociomantic/mxnet that referenced this pull request Apr 12, 2019
https://github.com/apache/incubator-mxnet/releases/tag/1.3.1

This updates to MXNet 1.3.1. We are skipping 1.2.x because they
indirectly reference missing commits. The update to 1.3.0 is skipped
because there is already the patched version 1.3.1 available.

The conflicts in `.gitmodules` are manually resolved to keep our
beaver and makd dependencies. For all other conflicts their version was
picked all the time.

To see our changes with respect to upstream MXNet diff against the MXNet
1.3.1 tag, i.e., `git diff 1.3.1..HEAD`.

* 3rdparty/dmlc-core e9446f5(e9446f5)...0a0e8ad(0a0e8ad) (41 commits)
  > Add OMPException class and use it for Text Parser (apache#445)
  > Fix build problem on windows (apache#450)
  > switch to safe_load for kubernetes config load (apache#449)
  > Add S3_IS_AWS env and fixed non-AWS behavior (apache#444)
  > add error message for s3 list (apache#439)
  (...)

* 3rdparty/mkldnn 0e7ca738(0e7ca738)...0e7ca738(0e7ca738) (99 commits)
  > build: bumped version to v0.14 in readme
  > build: bumped version to v0.14
  > cpu: reorder: start using jit uni for 8x8 transposition
  > cpu: reorder: jit uni: add 8x8 kernel
  > cpu: reorder: enable jit uni reorder
  (...)

* 3rdparty/mshadow a8c650c(a8c650c)...8a9e337(8a9e337) (9 commits)
  > Merge pull request apache#358 from eric-haibin-lin/revert
  > Merge pull request apache#357 from azai91/revert/d68d3
  > Merge pull request apache#356 from szha/omp
  > Add half_t support for batch_dot.  (apache#353)
  > Allow large array operation in MXNet (apache#348)
  (...)

* 3rdparty/onnx-tensorrt ()...3d8ee04(3d8ee04) (1 commits)
  > Refactor onnxGetBackendInfo (apache#39)

* 3rdparty/ps-lite v1+144(a6dda54)...v1+146(8a76389) (1 commits)
  > Merge pull request apache#133 from CodingCat/turn_up_down

* 3rdparty/tvm v0.3+434(90db723)d...v0.3+434(90db723)d (1 commits)
  > [FRONTEND] A Python hybrid frontend (apache#1251)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants