Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix hard-coding of opencl version to 2.0; fix 1d initialization of 2d… #173

Conversation

hughperkins
Copy link
Contributor

… arrays.

Fixes the two bugs identified in #172

This means that the test code runs to completion for hte first iteration, before failing with an error -38 now. Error -38 will be fixed in a pull request for 2111bb0 , once I have reproduced the issue, and demonstrated that 2111bb0 fixes it.

@TimmyLiu
Copy link
Contributor

Please make pull request to develop branch.

@TimmyLiu TimmyLiu closed this Oct 29, 2015
@TimmyLiu
Copy link
Contributor

currently master branch is ahead of develop branch with pull requests #158 , #163 and #170. we are going to bring develop branch up to date with master branch. Can you make a pull request against develop branch after that? If master branch is proven not stable and develop branch contains fixes. We can then merge develop branch to master branch and make another release.

@hughperkins
Copy link
Contributor Author

In my opinion you should have two branches really:

  • branch 2.8.x represnets version 2.8.x, and will contain bug fixes only
  • branch develop will contain new and original features and work

That way 2.8.x will be relativley stable. develop can contain bleeding edge work.

@kknox
Copy link
Contributor

kknox commented Oct 29, 2015

The opencl math library projects follow the 'git flow' scheme, in which all 'new' code should be committed into 'develop'. For critical bug-fixes, a we can cherry-pick commits and push out a new 'patch' (like 2.8.1) release. When making your commits into 'develop', it would help us if you isolate each bug fix into a single commit, so that we can cleanly cherry-pick each fix into 'master'. If your fork has many commits as you worked on bug-fixes, you can squash the commits into a minimal set first before you issue a PR with git rebase --interactive

The problem with accepting code into 'master' branch is that code from 'master' never flows into 'develop' (it's a one-way valve). We risk losing changes the next time 'develop' merges into 'master', because if the merge is done carelessly the changes to 'master' will be overwritten by 'develop' which never had the fix.

@hughperkins
Copy link
Contributor Author

For critical bug-fixes, a we can cherry-pick commits and push out a new 'patch' (like 2.8.1) release.

Hmmm. That sounds reasonable, and when I read it, I thought it was perfectly 100% reasonable. However, there seem to be two potential issues with this:

  1. once your development branch has gone through a certain number of revisions, the bugfixes will start to take place on code that looked totally different in master, or didnt even fully exist yet, and therefore the cherry-pick is impossible
  2. the cherry-picking approach is the sort of thing that never happens I reckon. The approach will plausibly become "well, you should just run off develop" :-)

@hughperkins
Copy link
Contributor Author

Addendum: for other projects, eg torch, there are no branches at all: everything runs from master. However, for torch, everyone runs in basically the exact same configuration: Ubuntu 14.04, with probably a CUDA card.

This is not really the case for clBLAS, where core team are using only AMD cards, but there are a lot more cards out there, so it's not really sufficient to run a few CI server tests and reckon it works: you wont know about all the bugs until people on different hardware/os combinations try them.

So, concretely, I'm not going to base my own library off your develop, because it's too unstable, rarely works for me, since mostly only tested on AMD (in my experience). ... and at the same time I cant run from your master, since missing bugfixes. For now, what I've been doing is making my own bugfix branch for this, currently 2.8-bugfixes1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants