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

Allow using system dSFMT #7448

Merged
merged 1 commit into from
Jun 28, 2014
Merged

Allow using system dSFMT #7448

merged 1 commit into from
Jun 28, 2014

Conversation

nalimilan
Copy link
Member

Add USE_SYSTEM_LIBRANDOM variable. Rename librandom to
dSFMT since distributions call it that way.

These changes are required to get Julia packaged in Fedora, since I was not allowed to bundle dSFMT in the Julia package: instead, I'm going to use the system library. This seems to work (i.e. I can get Julia to use the system library), but for some reason make always builds and installs dSFMT. Help welcome.

This requires a change in JuliaStats/Rmath-julia#4. I've not tested Rmath at the moment.

@ViralBShah
Copy link
Member

We should probably rename librandom to libdSFMT as well. We used to have some other C code for randn, which is now moved to julia.

@ViralBShah ViralBShah added this to the 0.3 milestone Jun 28, 2014
@nalimilan
Copy link
Member Author

Yeah, I was not sure about this one. Updating the PR.

Travis fails because of the Rmath commit is not available. And unfortunately it cannot be merged before this one...

@nalimilan
Copy link
Member Author

Done. I've removed the Rmath submodule update for now so that Travis can work.

@ViralBShah
Copy link
Member

Why don't you update the Rmath submodule as well? We are all here at the Julia Hack day at UChicago, so it should be easy to get stuff done.

@nalimilan
Copy link
Member Author

Why don't you update the Rmath submodule as well? We are all here at the Julia Hack day at UChicago, so it should be easy to get stuff done.

Because Travis cannot find the commit until it's merged, and I'd like to see the tests pass once. When it's OK I'll add Rmath back.

Add USE_SYSTEM_DSFMT variable. Rename librandom to
dSFMT since distributions call it that way.
@nalimilan
Copy link
Member Author

OK, Travis tests passed. I've added back the Rmath update.

@ViralBShah
Copy link
Member

Oops - sorry, I guess we do not have a way to update Rmath on the nightlies. I wonder if @staticfloat is around.

@ViralBShah
Copy link
Member

Never mind - we do pull Rmath in the travist tests.

ViralBShah pushed a commit that referenced this pull request Jun 28, 2014
@ViralBShah ViralBShah merged commit bdbab62 into JuliaLang:master Jun 28, 2014
@ViralBShah
Copy link
Member

Ok, both are merged now.

@ViralBShah
Copy link
Member

I am now getting this. What is the right way to install dSFMT.h? Should we put it in our JULIAHOME/usr/include when not using the system one?

clang -stdlib=libc++ -mmacosx-version-min=10.7 -m64  -Wall -O3 -fPIC -DMATHLIB_STANDALONE -I/Users/viral/julia/usr/lib   -std=gnu99 -I../include -DNDEBUG -c randmtzig.c -o randmtzig.o
randmtzig.c:68:10: fatal error: 'dSFMT.h' file not found
#include "dSFMT.h"
         ^
1 error generated.
make[1]: *** [randmtzig.o] Error 1

@ViralBShah
Copy link
Member

There's a typo in deps/Makefile. Fixing it.

@ViralBShah
Copy link
Member

Done in 20422c6

@nalimilan
Copy link
Member Author

Thanks! Do you know why dSFMT is built even when USE_SYSTEM_DSFMT=1?

@ViralBShah
Copy link
Member

I have a fix for it. Coming in a bit.

@nalimilan nalimilan deleted the librandom branch June 28, 2014 19:35
@ViralBShah
Copy link
Member

Can you try master and see if it does the right thing now?

@nalimilan
Copy link
Member Author

Seems to work. Thanks! I'll try to build a RPM using system dSFMT.

@nalimilan
Copy link
Member Author

Building RPM also works (though I get an apparently unrelated error).

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

2 participants