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

[DOC] minor fix #308

Merged
merged 1 commit into from
Oct 17, 2015
Merged

[DOC] minor fix #308

merged 1 commit into from
Oct 17, 2015

Conversation

tqchen
Copy link
Member

@tqchen tqchen commented Oct 17, 2015

No description provided.

tqchen added a commit that referenced this pull request Oct 17, 2015
@tqchen tqchen merged commit 7975165 into apache:master Oct 17, 2015
eric-haibin-lin pushed a commit to eric-haibin-lin/mxnet that referenced this pull request Dec 2, 2017
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.

1 participant