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

[R] Change R-Package License to BSD #317

Merged
merged 1 commit into from
Oct 18, 2015
Merged

[R] Change R-Package License to BSD #317

merged 1 commit into from
Oct 18, 2015

Conversation

tqchen
Copy link
Member

@tqchen tqchen commented Oct 18, 2015

No description provided.

@tqchen
Copy link
Member Author

tqchen commented Oct 18, 2015

@thirdwing @mli @hetong007

@tqchen tqchen changed the title [R] Change License to BSD [R] Change R-Package License to BSD Oct 18, 2015
@tqchen
Copy link
Member Author

tqchen commented Oct 18, 2015

The major reason for licensing R-Package under BSD is to respect the license of Rcpp, which current R package uses. The main code repo remains apache-2.0

tqchen added a commit that referenced this pull request Oct 18, 2015
@tqchen
Merge pull request #317 from tqchen/master
f11c343 
[R] Change R-Package License to BSD
@tqchen tqchen merged commit f11c343 into apache:master Oct 18, 2015
@lebeg lebeg mentioned this pull request Jan 9, 2018
Merged
5 tasks
anirudh2290 pushed a commit to anirudh2290/mxnet that referenced this pull request Jan 11, 2018
@liuliang01 @tqchen
add qid as ranklib format (apache#317)
e882498 
* add qid for session-id

* fix qid not have weight

* fix qid not have weight

* change logs

* change logs

* delete space

* format spaces

* change qid type to size_t

* change default qid value to 0

* use atol parse session id

* fix format

* just rebuild for ci mac pip command not found error

* fix travis.yml

* change qid type from size_t to uint64_t
iblislin added a commit to iblislin/incubator-mxnet that referenced this pull request Mar 18, 2018
@iblislin @pluskid
docs: update examples in overview (apache#317)
e4b6c0e 
* docs: update examples in overview

close apache#286

* docs: add Makefile
joseph-wakeling-sociomantic added a commit to joseph-wakeling-sociomantic/mxnet that referenced this pull request Mar 23, 2018
@joseph-wakeling-sociomantic
Merge stable 1.1.0 release of MXNet
184b9de 
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)
@joseph-wakeling-sociomantic joseph-wakeling-sociomantic mentioned this pull request Mar 23, 2018
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@tqchen