natas_hw
/
jidt
mirror of https://github.com/jlizier/jidt
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
934 Commits 5 Branches 6 Tags 65 MiB
Commit Graph

586 Commits

Author SHA1 Message Date
jlizier c0b9d736d7 Added methods to retrieve mean and standard deviation of the Chi^2 null distribution, as well as (empirical) unit test for this. 2018-05-13 22:02:46 +10:00
jlizier 46a9785da2 In surrogates for MI and CMI also turning adding noise off since this will have been done in the initial calculation already, and will just broaden the noise here. 2018-05-12 22:35:54 +10:00
jlizier 28ba409ff6 Turning off normalisation when computing surrogates in Common CMI and MI calculators, because normalisation has already been carried out (and if one variable had no variance, this will inflate the values back to original scale) 2018-05-12 21:30:39 +10:00
jlizier 0e4455b2fd Corrects the access at one point to the bins for the data points in the multivariate kernel estimator, which should use an IntArray object but did use an int[] object to access . Fixes #69. 2018-05-10 20:20:02 +10:00
jlizier 860d43dbca Adding additional error message for Exception during KSG Active Info Storage auto-embedding 2018-05-07 23:15:33 +10:00
jlizier 1f625b59f0 AutoAnalyser: fixing bug where column numbers for data are all set to zero if the user unclicks the "compute result?" button 2018-05-07 22:57:10 +10:00
jlizier d1bba0e4c1 Adding computeLocalOfPreviousObservations() to continuous Entropy estimator interface and all underlying implementations. Added unit tests that locals should average back ok. Also fixing multivariate Entropy estimator interface to implement the univariate interface also (and fixing underlying implementations to comply) 2018-04-27 11:20:25 +10:00
jlizier bf0062b902 Switching new debug method in KSG conditional MI calculator 1 to be publicly accessible 2018-04-26 11:43:04 +10:00
jlizier 7d76f82bb2 Adding partialNeighbourCountFromObservations() method to KSG conditional MI calculator 1 for debugging investigations into the neighbour counts 2018-04-26 11:24:56 +10:00
Pedro Martinez Mediano c15c643a09 Added tests for new embeddings in univariate KSG TE calculator. 2018-04-22 22:25:40 +01:00
Pedro Martinez Mediano df8eec27cd Added MAX_CORR_AIS_AND_TE embedding to univariate KSG TE calculator. 2018-04-22 22:25:05 +01:00
Pedro Martinez Mediano f8bca3275d Fixed docs for new MAX_CORR_AIS_AND_TE embedding method. 2018-04-22 20:45:06 +01:00
Pedro Martinez Mediano 02dad26a94 Added brief mention of AUTO_EMBED_METHOD_MAX_CORR_AIS_AND_TE to javadocs. 2018-02-27 20:29:39 +00:00
Pedro Martinez Mediano 03d5e2fb2f Added tests for new TE autoembedding methods. 2018-02-27 20:18:28 +00:00
Pedro Martinez Mediano 5f6671aa2b Added AUTO_EMBED_METHOD_MAX_CORR_AIS_AND_TE to multivariate KSG TE. 2018-02-27 20:18:04 +00:00
Pedro Martinez Mediano d4c9b28973 Fixed error in KSG TE multivariate tester. 
Tester was wrongly calling the univariate version of the algorithm using
the first column of the input.
 2018-02-27 20:16:44 +00:00
Pedro Martinez Mediano 550ff793eb Fixed bug in KSG TE multivariate embeddings and setObservations. 2018-02-27 20:14:08 +00:00
Pedro Martinez Mediano 438a88c97c Added unittests for multivariate KSG TE autoembedding. 2018-02-27 17:56:42 +00:00
Pedro Martinez Mediano 8be6a037af Added auto-embedding methods to multivariate KSG TE calculator. 2018-02-25 19:23:09 +00:00
Pedro Martinez Mediano ce4b1599c6 Added MAX_CORR_AIS embedding method to multivariate KSG AIS. 2018-02-25 18:57:15 +00:00
Pedro Martinez Mediano 75bb2c814a Added addObservations-related methods to multivariate TE calculators. 
This is needed to implement auto-embedding methods later.
 2018-02-25 18:54:36 +00:00
Pedro Martinez Mediano 08f25beee6 Add tests for new overloadings in KSG mixed calc. 2018-01-12 22:23:12 +00:00
Pedro Martinez Mediano b0fc309d6a Add overloadings for 1d continuous variables in KSG mixed calc. 2018-01-12 22:22:46 +00:00
jlizier 0278f95ae9 Enabled use of USE_GPU property for KSG calculators in the AutoAnalysers for CMI, TE, CTE and AIS 2017-12-30 12:03:17 +11:00
Pedro Martinez Mediano 92f1154e3d Added smoke junit tests for GPU CMI reordering. 2017-12-19 20:43:25 +00:00
Pedro Martinez Mediano 64f1142b40 Added argument to choose which variable to reorder in GPU CMI code. 2017-12-19 20:42:58 +00:00
Pedro Martinez Mediano 65ac0e9ff8 Removed unnecesary overloaded method in KSG CMI calc. 2017-12-19 20:41:11 +00:00
Pedro Martinez Mediano 4949a1079d Added junit KSG GPU CMI tests. 2017-12-18 17:51:03 +00:00
Pedro Martinez Mediano 2f1cd192b8 Fixed small typo in Java KSG CMI calculator. 2017-12-18 17:50:37 +00:00
Pedro Martinez Mediano 1fb4015df5 Remove debug mode from junit GPU MI tests. 2017-12-18 17:43:15 +00:00
Pedro Martinez Mediano d0304ae0c4 Added Java-side JNI functions and ensureKdTreesConstructed to KSG CMI. 2017-12-12 11:19:40 +00:00
Pedro Martinez Mediano f4ca442de4 Now KSG MI calc does not build KdTrees if GPU is going to be used. 2017-12-12 11:10:50 +00:00
Pedro Martinez Mediano d010f32635 Updated getProperty and removed spurious dependency in KSG MI calc. 2017-12-12 11:04:32 +00:00
Pedro Martinez Mediano eabd7f3701 Fixed typo in Kozachenko entropy calculator. 2017-11-28 16:58:13 +00:00
Pedro Martinez Mediano 444fb70801 Added addObservations-type functions to Kozachenko entropy calculator. 2017-11-28 16:56:51 +00:00
Pedro Martinez Mediano e290040d8d Added docs to Kozachenko entropy calculator. 2017-11-28 16:26:46 +00:00
Pedro Martinez Mediano 35df6ca3da Kozachenko entropy estimator now adds noise to data by default. 2017-11-28 16:04:09 +00:00
jlizier 9c96ceb850 Fixed logic for when parameter values (in particular auto-embedded properties) are written back into the properties table after the calculation. This was happening only when we had the "all pairs" option selection, when it should only happen when this is not selected. 2017-11-28 12:36:06 +11:00
jlizier 589d51674e Altering the escaped data filename in AutoAnalyser to be properly escaped using non-regex replace, and also rolling back the use of escaping to only Java (Matlab and Python on windows seem fine with the non-escaped filenames, for e.g. the paths earlier in the generated code) 2017-11-27 10:19:36 +11:00
jlizier 3bfbaa7ad3 In AutoAnalyser escaping data filenames when they are written to the generated code. This is important for windows filenames. Am not sure why it didn't come up before as an issue though. 2017-11-27 09:57:07 +11:00
jlizier 61f4bf3276 Adding getProperty lines to handle USE_GPU property for KSG MI calculator 2017-11-27 09:26:19 +11:00
jlizier db0503d763 Having AutoAnalyser continue with the calculation where the generated code cannot be written 2017-11-26 18:04:29 +11:00
jlizier df8724b872 Altered AutoAnalyserLauncher to either auto-detect jar location or assume demos/AutoAnalyser folder is current location (if a command line argument is given). Similarly, altered AutoAnalyser to either take location of demos/AutoAnalyser folder, or assume it is the current folder. 2017-11-26 01:10:30 +11:00
jlizier fd804d0d0c Added properties for running GPU calculation to MI AutoAnalyser 2017-11-26 01:07:19 +11:00
jlizier 69af7252cd Added debug print on working directory to AutoAnalyser startup 2017-11-25 00:15:37 +11:00
jlizier ddf3b4de0a Moving AutoAnalyser java files into the main source location rather than in the demos location. This commit includes the moving of the files themselves. Further commits will alter the ant script and run scripts to have correct classpath, etc. 2017-11-24 21:07:33 +11:00
jlizier 142fbb4541 Merge branch 'master' of github.com:jlizier/jidt 
Merging in Pedro's mixed Kraskov changes, plus further work on GPU for Kraskov MI
 2017-11-24 15:30:20 +11:00
jlizier 9e77ebdadf Tweak to method to print out an array of ints 2017-11-22 20:49:05 +11:00
jlizier 1bb67f0840 Adding neighbour search utilities in preparation for attempting fast surrogate generation (performing multiple neighbour searches at once where we can); in particular adding a countPointsWithinR with a remapping of the point's indices. Unit test added as well for this. 2017-11-22 20:48:30 +11:00
Pedro Martinez Mediano 446ac4ae59 Merge branch 'master' into gpu 2017-11-21 14:58:15 +00:00
Joseph Lizier c5c38335ef
Merge pull request #58 from pmediano/master 
Major improvements to KSG mixed (continuous-discrete) MI calculator.
 2017-11-22 00:23:10 +11:00
Pedro Martinez Mediano ecda70f8e9 Hard-setting dynCorrExclTime to 0 in KSG mixed calc. 
Previous implementation was incomplete due to a mismatch between the
sample indices in the full and marginal KdTrees. Some code has been left
to guide future development.
 2017-11-20 14:47:00 +00:00
Pedro Martinez Mediano 25df49fa5a KSG mixed calc now allocates memory for locals only if requested. 2017-11-20 14:26:25 +00:00
Pedro Martinez Mediano 8f169171e1 Fixed small bug in KSG mixed calc surrogates. 
Surrogate calculator was applying timeDiff twice, so surrogate
dataset had abs(timeDiff) less observations than it should.
 2017-11-20 14:14:49 +00:00
Pedro Martinez Mediano d40024e1cd Allow negative timeDiff in KSG mixed calc. 2017-11-20 14:02:00 +00:00
jlizier 0e27dbcbc2 Fixed default value of dynamic exclusion window in Kernel MI calculator to be 0. Technically it is zero (because dynCorrExcl boolean is set to false, but gets reported as 100 because the integer value of dynCorrExclTime was not set to 0 itself) 2017-09-02 20:18:36 +10:00
Pedro Martinez Mediano ed71502bc2 Remove old cudaLibraryLoad code and unnecessary dependencies. 2017-08-31 16:22:12 +01:00
Pedro Martinez Mediano 83e77e8b3a Merge Joe's master into Pedro's master with KSG mixed changes. 2017-08-30 17:36:32 +01:00
Pedro Martinez Mediano 9b7d7c70c8 Add unittests for noise level and Theiler window in KSG mixed calc. 2017-08-30 13:31:13 +01:00
Pedro Martinez Mediano f56ac6e69e Fix bug with Theiler window in KSG mixed calc. 2017-08-30 13:30:30 +01:00
Pedro Martinez Mediano 5961fb6246 Add Theiler window and jitter to KSG mixed calc. 2017-08-30 12:17:02 +01:00
Pedro Martinez Mediano 9aea9c4a02 Added some tests for KSG mixed setProperty. 2017-08-30 09:14:56 +01:00
jlizier d36c803e41 Added utilities to convert between estimate values and p-values for an analytic null distribution in bulk (array calls) 2017-08-30 16:24:17 +10:00
Pedro Martinez Mediano 626293b84d More docs for KSG mixed calc. 2017-08-30 01:19:54 +01:00
Pedro Martinez Mediano e11218631e Added myself as author of KSG mixed calculator. 2017-08-29 23:56:28 +01:00
Pedro Martinez Mediano 49afa343fc Removed old variables and functions from KSG mixed, added docs. 2017-08-29 23:55:10 +01:00
jlizier 19f2c5abbc Performance tweaks for TE Discrete, which should make a difference when the state space is large in comparison to the number of samples. 2017-08-28 00:36:24 +10:00
jlizier c59d932a44 Misc spacing/comment patches 2017-08-23 00:19:43 +10:00
jlizier b2e3ae1ca0 Added missing getProperty() method to Conditional TE calculator Kraskov 2017-08-23 00:19:09 +10:00
jlizier 0e40ec2401 Initialising conditional TE calculator to have one conditional dimension by default instead of none. Also fixing the way the conditional parameters are printed via getProperty() when they are null. 2017-08-23 00:18:41 +10:00
jlizier 4db008ce33 For Conditional MI calculators (sontinuous), adding setObservations and addObservations method signatures which take univariate arrays (only work if initialised dimensionalities are univariate) into the interface, and the common base class. This is in preparation for the CMI AutoAnalyser 2017-08-22 21:26:44 +10:00
jlizier 4d6fc1a572 Updated Kozachenko-Leonenko multivariate Entropy calculator to implement EntropyCalculator interface, in preparation for Entropy AutoAnalyser 2017-08-21 14:56:20 +10:00
jlizier 086bee5945 Making continuous MultiInfoCalculator classes implement the InfoMeasureCalculatorContinuous interface. For the interfaces, this means removing methods where duplicated. For implementing classes, this means adding the missing methods. 2017-08-18 23:42:43 +10:00
jlizier 057f17e338 Making continuous PredictiveInfoCalculator classes implement the InfoMeasureCalculatorContinuous interface. For the interfaces, this means removing methods where duplicated. And fixed the common implementing class to have the missing getProperty method. 2017-08-18 23:11:37 +10:00
jlizier 65c7cd99cc Making continuous EntropyCalculator and EntropyCalculatorMultiVariate classes implement the InfoMeasureCalculatorContinuous interface. For the interfaces, this means removing methods where duplicated. Also added NUM_DIMENSIONS property to EntropyCalculatorMultiVariate interface, so that these calculators can have an initialise() method which takes no parameters. Fixed all implementing classes to have any methods that they were missing. 2017-08-18 20:18:29 +10:00
jlizier d6bd16546b Added new interface InfoMeasureCalculatorContinuous to capture common methods for continuous calculators. Also adapted most continuous calculators to implement this, which involved in many cases removing duplicate definitions of these methods in the interfaces for these measures. For ConditionalMI calculator, this meant we needed to add an implementation of the zero-argument initialise() call also. Still need to do MultiInfo, PredictiveInfo and Entropy in future, as they're missing a few methods. 2017-08-18 16:54:55 +10:00
jlizier 04351498aa Changed my mind and pulled EmpiricalNullDistributionComputer in as being extended/implemented by ChannelCalculatorDiscrete. (This does make sense, since "extend" for an interface really means implements, it's not so much a child class). This necessitated removing the interface from explicitly being named in the definitions of the discrete MI and TE calculators since it's there implicitly. 2017-08-18 15:40:00 +10:00
jlizier 3e64fd28bd Altering various continuous calculators to implement the EmpiricalNullDistributionComputer interface (where they're already implementing computeSignificance() etc.). Also altered the EmpiricalNullDistributionComputer methods to throw Exceptions, since the continuous calculators generally do this (and doesn't harm the discrete ones). Also involved implementing the methods in ConditionalMIMultiVariateCommon by selecting to permute the first variable by default. 2017-08-18 15:31:27 +10:00
jlizier 60105e6d10 ActiveInformationCalculatorDiscrete was stuck in the past and returning results computing with the log using the base of the alphabet size (everything else uses bits). I'm not sure how I missed this one. Fixed now. 2017-08-18 14:07:26 +10:00
jlizier d9e43d966a Added implementation of EmpiricalNullDistributionComputer to various discrete calculators which implement computeSignificance() etc. Also involved removing the method from ChannelCalculatorDiscrete, as there's no way of having it (an interface) specify implementing an interface without extending it which I didn't think was completely logical. So ChannelCalculators can always be checked against implementing EmpiricalNullDistributionComputer if one wants to use computeSignificance with them. This also required adding the computeSignificance(int[][]) method to ConditionalTECalculatorDiscrete and TECalculatorDiscrete 2017-08-18 13:58:38 +10:00
jlizier d77a9f274e Added interface ChannelCalculator for MutualInfoCalculatorMultiVariate; this should have always been there but not all calculators implemented the univariate methods. It previously only implemented ChannelCalculatorMultiVariate. Added those methods into MutualInfoMultiVariateCommon, which provides the base implementation for all required calculators, so all are now taken care of. This means MI and TE can both be fully used in one interface with the set/addObservations methods. 2017-08-18 13:54:10 +10:00
jlizier 70740c9753 Added new interface EmpiricalNullDistributionComputer. Will separately alter discrete and continuous calculators to implement this class where they are implementing the required measures. 2017-08-18 13:49:09 +10:00
jlizier fa6307b4f2 Fixing javadoc reference in AnalyticNullDistributionComputer to correct class 2017-08-18 13:48:03 +10:00
Pedro Martinez Mediano bfe8156584 Add KDTrees to computeLocalUsingObservations in KSG mixed calc. 2017-08-16 19:28:24 +01:00
Pedro Martinez Mediano 641d17ec24 Fix bug with normalisation in KSG mixed and change unittest accordingly. 2017-08-16 19:18:51 +01:00
Pedro Martinez Mediano faa98a8d79 Added more references and tests for KSG mixed calc. 2017-08-16 18:21:24 +01:00
Pedro Martinez Mediano 7635cf8689 Added computeLocalOfPreviousObservations to KSG mixed. 
It follows the same pattern as the continuous MI: there is a
computeFromObservations method that returns either locals or average
based on a flag.
 2017-08-16 14:52:54 +01:00
Pedro Martinez Mediano 1065662739 Added more tests to KSG mixed locals. 2017-08-16 14:51:33 +01:00
Pedro Martinez Mediano 2d42e6ebad Removed unused function from KSG mixed. 2017-08-16 14:39:53 +01:00
Pedro Martinez Mediano 23bb573bb1 Replace computeSignificance method in KSG mixed with new one based on clone(). 2017-08-16 14:33:47 +01:00
Pedro Martinez Mediano 8251bdc1cb Removed unused variables from KSG mixed. 2017-08-16 13:35:03 +01:00
Pedro Martinez Mediano f55a7bd961 Add KdTrees to main compute() method in KSG mixed. 2017-08-16 13:31:18 +01:00
Pedro Martinez Mediano bad50ce663 KSG mixed now ignores batches of data shorter than timeDiff. 2017-08-16 13:27:05 +01:00
Pedro Martinez Mediano b5d2b7e367 KSG mixed now throws error if discrete data is out of range. 2017-08-16 13:25:44 +01:00
Pedro Martinez Mediano 8d1d1ab0eb Moarr tests for KSG mixed. 2017-08-16 10:24:00 +01:00
Pedro Martinez Mediano 9b42911c60 Add KSG mixed unit test comparing against analytical value. 2017-08-16 01:01:31 +01:00
Pedro Martinez Mediano dcd6314082 Add a few unit tests for KSG mixed calculator. 2017-08-16 00:26:53 +01:00
Pedro Martinez Mediano 437e606233 getNumObservations in KSG mixed now returns totalObservations. 
Before it returned continuousData.length, which more more prone
to null pointer errors, and therefore riskier.
 2017-08-16 00:07:51 +01:00
Pedro Martinez Mediano 39ad14d855 Added function to set timeDiff property. 2017-08-15 21:41:52 +01:00
Pedro Martinez Mediano abeb15cd6e Added standard start/finaliseAddObservations to mixed KSG calc. 2017-08-15 21:25:03 +01:00
Pedro Martinez Mediano 26137d12b1 Added precomputed digammas in KSG mixed calculator, fixed bug in locals. 2017-08-15 20:46:07 +01:00
jlizier 550bbae5c1 Patched computeSignificance() for discrete TE calculator, since this was not returning the correct degrees of freedom for the Chi square distribution (it multiplied the history lengths by the base, instead of raising them to the power) 2017-06-16 13:39:43 +10:00
jlizier bd94172d60 Removed setting the miComputed flag to true in a computeLocal method, since this could be called with new observations. 2017-06-16 13:38:45 +10:00
jlizier e25364b84c Added computeSignificance() to AIS discrete calculator 2017-06-16 13:38:11 +10:00
jlizier ea40f48bbc Adding new methods computePValueForGivenEstimate() and computeEstimateForGivenPValue to AnalyticMeasurementDistribution and implementing in ChiSquareMeasurementDistribution. Involves importing (and refactoring) a significantly larger chunk of commons.maths3 classes (and updating existing ones to latest 3.6.1 version for consistency). Also addresses issue #23 in changing the actual value of the ChiSquareMeasurementDistribution to be that of the information theoretic measurement rather than 2*N times it (which was the value that is actually chi squared distributed), which also necessitates changes to the Discrete and Gaussian calculators computeSignificance() methods. 2017-06-14 11:09:01 +10:00
jlizier a2b9939892 Merge branch 'master' of github.com:jlizier/jidt 
to combine local changes with Pedro's GPU pull
 2017-06-13 12:08:54 +10:00
jlizier 77f4c1afd5 Added partialNeighbourCountFromObservations() method for Leo's analytic work on neighbour counts 2017-06-13 12:04:41 +10:00
jlizier 4b8e26fc05 Changed various computeLocal methods from private to public (these were mistakenly private) 2017-06-13 12:03:56 +10:00
Pedro Martinez Mediano d0b35b3db8 Added NativeUtils for native lib loading and included libKraskov.so in jar. 2017-06-01 20:34:23 +10:00
Pedro Martinez Mediano 834a3ec2c2 Relocated GPU code and modified build and load paths accordingly. 2017-06-01 17:22:42 +10:00
Pedro Martinez Mediano c0a4a283fa Added junit test for GPU MI calculation with non-zero exclusion window. 2017-05-31 04:20:38 +10:00
Pedro Martinez Mediano 2a203faa23 Added support for Theiler exclusion window in JNI code. 2017-05-31 04:19:49 +10:00
Pedro Martinez Mediano bc44e4c2fb Main workflow now operates using only device functions. 
This saves time and energy by keeping all data in te GPU, rather than
transfering it back and forth all the time.
 2017-05-31 02:38:44 +10:00
Pedro Martinez Mediano 85dd28d13b Separated digamma and reduction into host and device functions. 2017-05-31 02:36:45 +10:00
Pedro Martinez Mediano 7a89dd7908 Modified handling of normFunction and replaced signallength with signalLength. 2017-05-31 02:35:11 +10:00
Pedro Martinez Mediano 6c25ea93ef Added functions to allocate and free all the GPU memory at once. 2017-05-31 02:31:37 +10:00
Pedro Martinez Mediano 721c96c040 Added prototypes of device functions to gpuKnnLibrary header. 2017-05-30 23:00:17 +10:00
Pedro Martinez Mediano c9d6a8a3bc Now Makefile finds compute capabilities of all GPUs in the system. 2017-05-30 17:39:06 +10:00
Pedro Martinez Mediano 6645653ab3 Added unit tests for GPU digamma calculation and block reduction. 2017-05-30 01:37:43 +10:00
Pedro Martinez Mediano 75a03341b9 Separated digamma and reduction into host and device functions, now doing block reduction in device. 2017-05-30 01:36:56 +10:00
Pedro Martinez Mediano f4ef357a84 Multiple improvements to increase portability of GPU build system. 
- Checks CUDA and nvcc are available, otherwise exit nicely.
- Automatically looks for JNI header files.
- Automatically checks GPU-specific compute capability flags.
 2017-05-30 01:24:43 +10:00
Pedro Martinez Mediano 180e5cbf45 Minor rearrangements in digamma functions. 2017-05-29 09:20:29 +10:00
Pedro Martinez Mediano 727a76fe94 Renamed cudaSumDigammas function. 2017-05-29 09:18:00 +10:00
Pedro Martinez Mediano 7eb91957ce Remove old comments. 2017-05-29 09:11:08 +10:00
Pedro Martinez Mediano 4b374de8c1 Added function to calculate and sum digammas fully on GPU to the main workflow. 2017-05-29 09:10:33 +10:00
Pedro Martinez Mediano 34c9ebd6ad Added CUB library of low-level CUDA primitives. 2017-05-28 02:40:56 +10:00
Pedro Martinez Mediano a5e3d18e6a Separated RS function in host and device sections. 2017-05-28 02:07:55 +10:00
Pedro Martinez Mediano fb01036127 Separated kNN function in host and device sections. 2017-05-28 01:55:55 +10:00
Pedro Martinez Mediano 0845420fdf Rearranged function order in gpuKnnBF_kernel. 2017-05-28 01:53:30 +10:00
Pedro Martinez Mediano 502289d666 Replaced manual absolute value calculation with CUDA Math API fabsf. 2017-05-27 04:23:03 +10:00
Pedro Martinez Mediano 0d296c854c Fix minor warnings. 2017-05-27 04:20:45 +10:00
Pedro Martinez Mediano d94a373ca8 Added warning flags to Makefile. 2017-05-27 04:20:11 +10:00
Pedro Martinez Mediano 1beb7a47fc "extern C" qualifiers now surround all gpuKnnLibrary as a whole, instead of in every function. 2017-05-26 04:58:18 +10:00
Pedro Martinez Mediano 36d821979d Renamed gpuKnnLibrary.cu to .c. Now .cu extension is reserved for files with kernels. 2017-05-26 04:55:13 +10:00
Pedro Martinez Mediano 56771c94b4 Minor change to timing tags in perftest. 2017-05-26 04:54:05 +10:00
Pedro Martinez Mediano 91b1235380 Added statistical unbiasedness tests for C permutation function. 2017-05-25 15:16:20 +10:00
Pedro Martinez Mediano d8779ee9f5 Added randperm to gpuMILibrary header so that it can be seen by other files. 2017-05-25 15:16:00 +10:00
Pedro Martinez Mediano 94bcfc1477 Added conditional to Java GPU tests to ignore test if GPU disabled. 2017-05-25 02:57:13 +10:00
Pedro Martinez Mediano 6af0e22030 Merge branch 'master' into gpu 2017-05-25 02:44:59 +10:00
Pedro Martinez Mediano a642c0a8c8 Fix prints in digamma timers. 2017-05-25 02:29:07 +10:00
Pedro Martinez Mediano 79859e0832 Add warm-up period to benchmarking script. 2017-05-25 02:15:21 +10:00
Pedro Martinez Mediano c8ceec9f71 Added more timers and unified format a bit. 2017-05-25 01:41:53 +10:00
Pedro Martinez Mediano cce345b0ed Removed comments and prints from perftest.cpp 2017-05-25 01:09:34 +10:00
Pedro Martinez Mediano 3fb9632439 Improved ctimer to align printf outputs. 2017-05-25 01:06:04 +10:00
Pedro Martinez Mediano 82c06abbeb Added C unit tests for GPU digamma reduction. 2017-05-25 00:20:52 +10:00
Pedro Martinez Mediano 715050d4e6 Added GPU chunk digamma reduction to main workflow. 2017-05-25 00:20:06 +10:00
Pedro Martinez Mediano 2d8d0271ca Added first version of GPU chunk digamma reduction function. 
For now the calculation of the digammas is fully parallel but sums are
done in CPU.
 2017-05-25 00:19:07 +10:00
Pedro Martinez Mediano afcfb61260 Added C unit test for GPU digamma calculation without reduction. 2017-05-24 23:28:41 +10:00
Pedro Martinez Mediano 20c019267c Added full C function for parallel digamma calculation without reduction. 2017-05-24 23:27:41 +10:00
Pedro Martinez Mediano ada9128389 Added kernel for gpu digamma calculation without reduction. 2017-05-24 23:26:33 +10:00
Pedro Martinez Mediano 7fe8bf47cc Added GPU digamma reduction to main workflow for single-chunk cases. 2017-05-24 22:19:36 +10:00
Pedro Martinez Mediano e39afcd5b4 Fixed bug related to manual casting in digamma reduction kernel. 2017-05-24 22:19:07 +10:00
Pedro Martinez Mediano 3a68e27af8 Fixed bugs in single-chunk digamma reduction GPU code. 2017-05-24 22:18:04 +10:00
Pedro Martinez Mediano 3dd4f6b224 Added C unit tests for single-chunk GPU digamma reduction. 2017-05-24 22:16:18 +10:00
Pedro Martinez Mediano b2c42563d0 GPU junit tests now run without debug mode to reduce printed statements. 
The debug statements are left commented for future reference.
 2017-05-24 22:14:46 +10:00
Pedro Martinez Mediano 991ef30a1e Removed spurious array print. 2017-05-24 22:13:19 +10:00
Pedro Martinez Mediano 09548028e0 Merge remote-tracking branch 'ghub/master'. This merges Joe's v1.3.1 master into Pedro's master. 2017-05-24 20:24:32 +10:00
Pedro Martinez Mediano 3054461f7a Add note for potential further optimisation. 2017-05-24 19:45:01 +10:00
Pedro Martinez Mediano d17d8cad03 Add small utility script to profile parts of GPU code. 2017-05-24 19:20:54 +10:00
Pedro Martinez Mediano 8da0bfc17b Fixed bugs in pointset arrangement. Inefficient but functional. 2017-05-24 18:52:37 +10:00
Pedro Martinez Mediano 39a5cadf06 RS functions now receive pointers to source/dest within pointset. 
This helps with surrogate calculation and is convenient for later memory
optimisation.
 2017-05-24 18:04:11 +10:00
Pedro Martinez Mediano 4cb9a9bb16 Fixed bug with surrogate digamma calculation. 2017-05-24 18:02:38 +10:00
Pedro Martinez Mediano 3c0ae81505 Added timers to kraskovCuda.c. 2017-05-24 17:28:20 +10:00
Pedro Martinez Mediano 1b1f4f9922 Added timers to gpuMILibrary. 2017-05-24 17:23:50 +10:00
Pedro Martinez Mediano bb241ae415 Added timers to gpuKnnLibrary. 2017-05-24 17:13:26 +10:00
Pedro Martinez Mediano 63f26a60fa Added Java+C tests for reorderings and random permutations. 2017-05-24 17:06:04 +10:00
Pedro Martinez Mediano ff868bf79f Added gpuWarmUp function to shorten latency in first GPU call. 2017-05-24 17:02:52 +10:00
Pedro Martinez Mediano cced321abb Renamed unit test source file. 2017-05-24 17:01:16 +10:00
Pedro Martinez Mediano 169c35e990 Makefile revamped. See comments: 
- Added CUSTOMFLAGS to define flags from Make CLI.
- Separated and re-arranged C object targets.
- Added targets for test binaries.
 2017-05-24 16:57:42 +10:00
Pedro Martinez Mediano 7d9d7ad135 Added MI calculation script for benchmarking purposes. 2017-05-24 15:48:19 +10:00
Pedro Martinez Mediano 3a64f2b926 Added lightweight inline timer for C functions. 2017-05-24 15:46:55 +10:00
Pedro Martinez Mediano c33436e69a Added Junit tests for surrogate reorderings. 2017-05-23 16:19:52 +10:00
Pedro Martinez Mediano 492cfe8b53 Added Java+JNI support for surrogate reorderings. 2017-05-23 16:19:33 +10:00
Pedro Martinez Mediano 4a31d3d7f1 Added C unit tests for surrogate reorderings. 2017-05-23 16:19:09 +10:00
Pedro Martinez Mediano 0b66c3a3f8 Added C support for arbitrary reordering of surrogates. 2017-05-23 16:18:16 +10:00
Pedro Martinez Mediano f2d6674a4f Added a few debug mode prints. 2017-05-23 05:13:57 +10:00
Pedro Martinez Mediano a7cef7f87f Added a few tests to check surrogate and pointset handling (more needed). 2017-05-23 02:11:02 +10:00
Pedro Martinez Mediano f7706f72bb Added missing includes and some test docs. 2017-05-23 02:10:31 +10:00
Pedro Martinez Mediano 0d555a34ca Separated chunk v. surrogate logic and cleared terminology and JNI bridge. 2017-05-23 02:09:24 +10:00
Pedro Martinez Mediano 5ba6cd093e Added proper source and header files for digamma implementation. 2017-05-23 02:06:08 +10:00
Pedro Martinez Mediano 9b455f7ef4 Added first few GPU performance tests to measure speed-up wrt CPU. 2017-05-22 15:05:43 +10:00
Pedro Martinez Mediano 001227c730 Added Java support for GPU surrogate calculation. 2017-05-22 15:03:32 +10:00
Pedro Martinez Mediano 118e32d9ad Separated GPU MI unit tests to separate file. 2017-05-22 14:49:21 +10:00
Pedro Martinez Mediano 71589d1150 Added Java+C tests to check consistency of local MI calculations. 2017-05-19 18:20:03 +10:00
Pedro Martinez Mediano ad3454cce3 Added a few unit tests for full MI calculation with surrogates. 2017-05-19 18:19:35 +10:00
Pedro Martinez Mediano a11c1aa2eb Changed extern properties of header files. 2017-05-19 18:19:13 +10:00
Pedro Martinez Mediano cc47398d50 Remove spurious print statement. 2017-05-19 17:53:40 +10:00
Pedro Martinez Mediano 6e9ade6542 Separated core MI function to different files (and hacked Makefile). 2017-05-19 16:53:26 +10:00
Pedro Martinez Mediano 4b665d525f Improved variable initialisation and error handling. 2017-05-19 16:52:29 +10:00
Pedro Martinez Mediano b26695bf8a Separated main KraskovMI computation from JNI bridge. First steps towards GPU surrogates. 2017-05-19 12:39:17 +10:00
Pedro Martinez Mediano bdbe0ed659 Added unittest bin to make clean target. 2017-05-19 08:19:54 +10:00
Pedro Martinez Mediano 8dc6eced45 Added missing import statement. 2017-05-19 06:47:16 +10:00
Pedro Martinez Mediano 2fbe03f4ec Add a C (non-CUDA) wrapper on cudaDeviceReset for easier compilation. 2017-05-19 06:46:06 +10:00
Pedro Martinez Mediano 5a07352969 Add unit tests inside Java for GPU code. 2017-05-19 06:39:57 +10:00
Pedro Martinez Mediano d7fa6814dd Improved error handling when loading GPU library. 2017-05-19 06:14:31 +10:00
Pedro Martinez Mediano 57aa4e95ee Add new property for users to specify custom path to GPU library. 2017-05-19 06:01:45 +10:00
Pedro Martinez Mediano 1abd5a084e Add manual casting of jobject to jdoubleArray. 2017-05-19 05:38:37 +10:00
Pedro Martinez Mediano dd83cd9ef1 Add tests for CUDA range search function. 2017-05-19 03:21:11 +10:00
Pedro Martinez Mediano 8675858e98 Moarr tests. 2017-05-19 02:16:15 +10:00
Pedro Martinez Mediano 470090321e Added a few initial C++ unit tests and new make target. 2017-05-19 01:41:43 +10:00