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

change cmake out put name to libmexnet.dll #316

Merged
merged 1 commit into from
Oct 18, 2015

Conversation

yajiedesign
Copy link
Contributor

@yajiedesign
Copy link
Contributor Author

...i am only change cmake and py....why check failed

tqchen added a commit that referenced this pull request Oct 18, 2015
change cmake  out put name to libmexnet.dll
@tqchen tqchen merged commit 0979504 into apache:master Oct 18, 2015
@tqchen
Copy link
Member

tqchen commented Oct 18, 2015

Thanks, this was a not your problem. The cpp-test rarely sometimes, but it was hard to reproduce normally we are looking into it.

eric-haibin-lin pushed a commit to eric-haibin-lin/mxnet that referenced this pull request Dec 2, 2017
* missing type name for void* and optional<float>

* declare type name for optional double as well
joseph-wakeling-sociomantic added a commit to joseph-wakeling-sociomantic/mxnet that referenced this pull request Jan 15, 2018
* cub 89de7ab2(89de7ab2)...05eb57fa(05eb57fa) (798 commits)
  > Merge pull request sociomantic-tsunami#1 from ptrendx/update
  > Create README.md
  > update readme.md
  > 1.7.0
  < 1.6.4 doc update (part 2)
  (...)

* dlpack ()...a6e09b5(a6e09b5) (1 commits)
  > Change order of device_type/id in Context (sociomantic-tsunami#11)

* dmlc-core a6c5701(a6c5701)...87b7ffa(87b7ffa) (54 commits)
  > add SetEnv (apache#322)
  > Fix a bug in seek/tell on Windows (apache#318)
  > Fixes apache#303: added recurse_directories to InputSplit::Create (apache#310)
  > Type name error (apache#316)
  > Small param bug (apache#315)
  (...)

* mshadow c037b06(c037b06)...2d7780c(2d7780c) (42 commits)
  > [CMAKE][ARM] Change USE_SSE to SUPPORT_MSSE2 to it uses the autodetected presence of sse compiler flag from the parent project (see PR apache#8395) (apache#303)
  > Makes repeated setting of gpu rng seed produce repeatable sequences. (apache#304)
  > Add USE_SSE which propagates into MSHADOW_USE_SSE in cmake (apache#302)
  > fix range (apache#301)
  > fix for random seed generation (apache#300)
  (...)

* nnvm b279286(b279286)...e4a138a(e4a138a) (139 commits)
  > [TVM] upgrade to latest version (apache#263)
  > Added support for CoreML Permute layers (apache#262)
  > [CMPL] Add Support for Other Data Types (apache#252)
  > fix onnx conv2d_transpose loading (apache#245)
  > [FIX] Fix from_mxnet for multiple outputs symbol (apache#247)
  (...)

* ps-lite v1+118(acdb698)...v1+123(2ce8b9a) (2 commits)
  > Merge pull request apache#117 from madjam/listen-interface
  > Merge pull request apache#109 from b0noI/master
joseph-wakeling-sociomantic added a commit to joseph-wakeling-sociomantic/mxnet that referenced this pull request Jan 15, 2018
Fixes sociomantic-tsunami#11

* cub 89de7ab2(89de7ab2)...05eb57fa(05eb57fa) (798 commits)
  > Merge pull request sociomantic-tsunami#1 from ptrendx/update
  > Create README.md
  > update readme.md
  > 1.7.0
  < 1.6.4 doc update (part 2)
  (...)

* dlpack ()...a6e09b5(a6e09b5) (1 commits)
  > Change order of device_type/id in Context (sociomantic-tsunami#11)

* cub 89de7ab2(89de7ab2)...05eb57fa(05eb57fa) (798 commits)
  > Merge pull request sociomantic-tsunami#1 from ptrendx/update
  > Create README.md
  > update readme.md
  > 1.7.0
  < 1.6.4 doc update (part 2)
  (...)

* dlpack ()...a6e09b5(a6e09b5) (1 commits)
  > Change order of device_type/id in Context (sociomantic-tsunami#11)

* dmlc-core a6c5701(a6c5701)...87b7ffa(87b7ffa) (54 commits)
  > add SetEnv (apache#322)
  > Fix a bug in seek/tell on Windows (apache#318)
  > Fixes apache#303: added recurse_directories to InputSplit::Create (apache#310)
  > Type name error (apache#316)
  > Small param bug (apache#315)
  (...)

* mshadow c037b06(c037b06)...2d7780c(2d7780c) (42 commits)
  > [CMAKE][ARM] Change USE_SSE to SUPPORT_MSSE2 to it uses the autodetected presence of sse compiler flag from the parent project (see PR apache#8395) (apache#303)
  > Makes repeated setting of gpu rng seed produce repeatable sequences. (apache#304)
  > Add USE_SSE which propagates into MSHADOW_USE_SSE in cmake (apache#302)
  > fix range (apache#301)
  > fix for random seed generation (apache#300)
  (...)

* nnvm b279286(b279286)...e4a138a(e4a138a) (139 commits)
  > [TVM] upgrade to latest version (apache#263)
  > Added support for CoreML Permute layers (apache#262)
  > [CMPL] Add Support for Other Data Types (apache#252)
  > fix onnx conv2d_transpose loading (apache#245)
  > [FIX] Fix from_mxnet for multiple outputs symbol (apache#247)
  (...)

* ps-lite v1+118(acdb698)...v1+123(2ce8b9a) (2 commits)
  > Merge pull request apache#117 from madjam/listen-interface
  > Merge pull request apache#109 from b0noI/master
iblislin added a commit to iblislin/incubator-mxnet that referenced this pull request Mar 18, 2018
joseph-wakeling-sociomantic added a commit to joseph-wakeling-sociomantic/mxnet that referenced this pull request Mar 23, 2018
https://github.com/apache/incubator-mxnet/releases/tag/1.1.0

A quite extended amount of manual work was needed here to resolve all
the conflicts, almost none due to the tsunami fork!

Some diffs seemed to survive the merge, and were fixed via manually
checking out the files in question from the upstream 1.1.0 tag.

* 3rdparty/cub ()...05eb57fa(05eb57fa) (1 commits)
  > Merge pull request sociomantic-tsunami#1 from ptrendx/update

* 3rdparty/googletest ()...release-1.8.0(ec44c6c) (1 commits)
  > Merge pull request apache#821 from mazong1123/master

* 3rdparty/openmp ()...37c7212(37c7212) (1 commits)
  > Merging r317115:

* 3rdparty/cub ()...05eb57fa(05eb57fa) (1 commits)
  > Merge pull request sociomantic-tsunami#1 from ptrendx/update

* 3rdparty/googletest ()...release-1.8.0(ec44c6c) (1 commits)
  > Merge pull request apache#821 from mazong1123/master

* 3rdparty/openmp ()...37c7212(37c7212) (1 commits)
  > Merging r317115:

* dmlc-core 87b7ffa(87b7ffa)...6389c10(6389c10) (20 commits)
  > Fix symbol demangling on stacktraces under Linux. (apache#356)
  > Add more environment variables to support 3rd-party S3 implementations (apache#354)
  > add qid as ranklib format (apache#317)
  > Make choice of archiver configurable (apache#352)
  > Fix warnings in unittest_lockfree.cc, fix travis CI (apache#347)
  (...)

* mshadow 2d7780c(2d7780c)...16ac8cd(16ac8cd) (5 commits)
  > Add fully qualified type on define default_real_t (apache#317)
  > fix AddTakeGradLargeBatch for CPU. close apache#235 (apache#316)
  > fix float16 min and max values (apache#315)
  > [Windows] make Packet::size constexpr (apache#313)
  > add GetRndEngine (apache#308)

* nnvm e4a138a(e4a138a)...7a052d6(7a052d6) (3 commits)
  > [SYMBOL] Add __iter__ and GetChildren for symbol (apache#268)
  > API call to get symbol output count (apache#270)
  > [FRONTEND] Fix mxnet multi outputs (apache#271)
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