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

Osx compatibility #22

Merged
merged 5 commits into from
Oct 13, 2015
Merged

Osx compatibility #22

merged 5 commits into from
Oct 13, 2015

Conversation

chvink
Copy link
Contributor

@chvink chvink commented Oct 12, 2015

This commit should fix a few issues encountered in issue #21.

chvink added 5 commits October 8, 2015 09:44
327e8b4 Hopefully adding OSX support to sys-c++

git-subtree-dir: externals/coda-oss
git-subtree-split: 327e8b4a9f02186c66614aa881e92add3facae98
2fc9ea7 Merge pull request #58 from mdaus/osx_config
0b70f4e Fixed typo in OSX code

git-subtree-dir: externals/coda-oss
git-subtree-split: 2fc9ea72e6672d544fdb8c1877adcad06bf52994
@chvink chvink added bug and removed bug labels Oct 12, 2015
asylvest added a commit that referenced this pull request Oct 13, 2015
@asylvest asylvest merged commit 81d3aa4 into master Oct 13, 2015
@asylvest asylvest deleted the osx_compat branch October 13, 2015 01:03
JonathanMeans pushed a commit that referenced this pull request Feb 24, 2020
be445dd Merge pull request #42 from porglezomp/master
5fd6e98 Ignore untarred driver folders
7614a42 io does not need to depend on unique since SafePath moved
0b266e2 Merge pull request #40 from mdaus/JavatoolUpdateForClasspaths
1e6cfee update to the logic in classpath section. I'm not sure there is a case when the user will want to specify a jar, and add it to the install_tgts. There was a bug with the former logic on Windows.
597dbc0 Merge pull request #39 from mdaus/disable_swig
26b8f93 Update jenkins.py
3b2ebc6 Merge pull request #38 from mdaus/python_install_update
55ba57e Fixed bugs
a70d02f Merge pull request #33 from mdaus/python_install_update
5af30e4 removed dead code
a347d58 better __init__.py handling code
7185d7c Merge branch 'master' of https://github.com/mdaus/coda-oss into python_install_update
07a94a8 Changes allowing windows support
5f22eb9 Merge pull request #35 from mdaus/install_swig_i_files
b66a309 Installing Swig interface files too
636c544 Merge pull request #34 from mdaus/vector2_python
5db18e7 Adding Vector2 bindings
7bd834d Added option to override python install directory
ced692f Fixed postfix bug in rpath logic
27e1b99 Started rpath addition
0ed7a98 Changed sys back to coda_sys, rm'd absolute_import
4b81dcb Added multi-package support
84c8c19 Merge branch 'master' of https://github.com/mdaus/coda-oss into python_install_update
db994f4 initial commit for rewrite of python packaging
4c84f1f Merge pull request #30 from mdaus/Add_str_function_to_StringStream
965c670 Added str() function to io::StringStream Python bindings
32bcb81 Merge pull request #29 from mdaus/fix_windows_python
9228d0e Removing some unneeded items on the use lines
a4c61b8 Some tricks to make Python bindings work properly on Windows - need to move the -python targets into targets_to_add to avoid some weirdness
655ef18 Merge pull request #27 from mdaus/jenkins-config
d97a013 The template specializations need to be inlined if they're going to remain in a header file.  Otherwise we'll get doubly defined linker errors.
11b63ec Update jenkins.py
d5abf59 Update jenkins.py
a67df1f Update jenkins.py
806e524 Update jenkins.py
0aea0b4 Update jenkins.py
7f4c01f Update jenkins.py
424a7bf Update jenkins.py
d046b60 Update jenkins.py
f7bdf0b Merge pull request #26 from mdaus/sio_lite_python_style_cleanup
6f317cd Adding angle and normSq() to checked-in generated bindings
1871dc6 Breaking dtype <--> SIO header type into their own functions to simplify implementation.
0063c70 Merge pull request #25 from mdaus/OneD_template_specializtion_for_Vector3
573ba86 Added template specializtions to math::poly::OneD<Vector3>
ccff9be Using static_cast
607ad54 Merge pull request #23 from mdaus/Polygon2D
b81fe60 Fixed bracing
3e825e7 Update wscript
eba1b0c Delete test_intersection.cpp
398056b Delete test_poly_2d.cpp
6a59787 Delete Polygon2D.h
6585d4e Adding algoirthm library for std::min
a0d6016 Merge pull request #24 from mdaus/rowcolint-revision
48a29b4 Correcting a templating issue with std::pow
a58a737 Fixing an ambiguous call to std::pow
fb8d2e5 Revert "initial commit of lapack fit.h, still very WIP and broken"
6bd818c Added types::RowCol<sys::SSize_T> and its vector to python bindings
dbd37d9 Merge branch 'master' of https://github.com/mdaus/coda-oss into rowcolint-revision
dcee071 initial commit of lapack fit.h, still very WIP and broken
78a187e Updated intersection
f6003dd Merge branch 'master' of https://github.com/mdaus/coda-oss into Polygon2D
ec3977a Need C++11 configure check to also include constexpr as VS 2013 doesn't support that
3b74405 There is no size_t std::pow() overloading
be13656 Merge pull request #20 from mdaus/complex_benchmark
75fcca4 this should prevent the constants from being double defined, but since this version does not have c++11 support enabled, I am unable to check if it works properly.
c0471f0 fixed the problem with str::toType, it is now being used again
060524e Added in comments to clarify code, added in liscense to top of test.  Also ran it and made changes to get desired behavior.
f5b062c Merge pull request #21 from mdaus/CPA-67_Fit_PolyVector3
fc260e6 Code review style cleanup
0c81abd Fixed according to comments.  The MODULE_DEPS was left in the wscript because math/Constants.h now depends on sys/sys_config.h.  atoi was kept in place of str::toType() as std::toType would not accept a c-string as an arguement when compiling
60494da Merge pull request #22 from mdaus/python_RowColSizeT
2865b82 Create test_intersection.cpp
e3f4b0a Create test_poly_2d.cpp
c78e153 Adjusted include guards
7f7f0ac Introduced Polygon2D
abaf57a Adding algs to wscript for use of ConvexHull
3ca45a3 Added a template for RowCol<size_t>
018f987 Cleaned up fit functions
39bd6e2 added another benchmarking test, to see how accumulate performs.  Also modified Constants.h and Constants.cpp to have c++11 support for constexpr if c++11 is available
3c23d99 Added in another benchmark that uses looping to accomplish its task.  This produces different results
03edfe8 Merge pull request #13 from mdaus/math_additions_tests
1def5de made some changes to benchmark test for formatting of output
666f708 Added benchmark test for testing efficient ways to take the mean of a complex array of floats.  Had to change wscript to make the math module include the sys module so that the stopwatch could be added.
af2318d Placed unnamed namespace around content outside of main()
45a6bb3 Placed unnamed namespace around content outside of main
c92627c Added hard coded tests
0c978f5 Merge pull request #19 from mdaus/Line2D
fd8fa7a Updated parameter name in constructor
6d5c78f Updated parameter name in constructor
7c18a29 Added unnamed namespace to content outside of main(), adjusted some lines to be under 80 chars
de41e5e Updated includes, corrected some lines going over 80 chars, removed unnecessary comments
2ac0248 Removed unnessecary includes, changed custom constructor to pass Point by const ref
e10b206 Added fit() functions for CPA that return the PolyVector3 type, and tests
6d9d65c Removed algs from MODULE_DEPS--is not actually needed
6de571a Moved Line2D implementation to source file
0bdbb49 Responded to Adam's comments on first request merge pull
a04d16b Added beginning copyright statement
9730e19 Fixing typos in comments
fbf4ce2 Merge pull request #17 from mdaus/cpp11_switch
0781db0 Delete Polygon2D.h
e4fea3d Added algs to module dependencies for Line2D.h
6c5dd70 An extensive test for Line2D.h functionality
2009277 Cleaned up some logic errors with throwing Exceptions
7220015 Tweaks and a more sensible way to check if a wscript is trying to force cpp11
8c36acc Merge pull request #16 from mdaus/463_sio.lite_write_for_noncontiguous_arrays
6d7b14f Merge pull request #18 from mdaus/win32_file_writer_64bit
29f0a35 Removed <size_t> from std::min
2b3339e bytesToWrite now is calculated against a size_t.
14d5ed4 Added a method to programatticly force c++11 usage if it exists
a2227c3 Added '--enable-cpp11' to waf build options, fixed sys/wscript to ACTUALLY define if support exists
e1e6f6e Added check for noncontiguous arrays in sio_lite.write().  Added test for writing noncontiguous arrays.
ddcf3e7 Merge pull request #15 from mdaus/python_name_clobber_postfix
55eb923 Added functionality supporting a _base postfix on python modules (analogous to coda_ prefix)
69aba4c Created Polygon2D.h Skeleton
8e52984 Added copyright statement
be30168 Created Line2D.h--not fully implemented functions yet
1f89331 Added types to nescessary modules
284ab7c Testing the new norm() and normSq() functions on VectorN objects
7afbb6a Testing the new norm() and normSq() functions on Vector objects
91aee7d Testing the new angle function for 3-dimensional Vector and VectorN
db32af1 Merge pull request #12 from mdaus/Tests_for_logger_python_bindings
5aa311a Added bindings and test for FileHandler.h
9d712b3 More future-proof way of using the SWIG disown typemap to prevent double-deletion of Formatters
8835af2 Merge pull request #11 from mdaus/python_shared_linkage
d95d7be Fixed bug with soname, typo
5d05437 Merge pull request #10 from mdaus/python_shared_linkage
1c695d2 fixed merge
d5b0877 added changes from soname_crossplatform
dcccda0 Actually added more logger bindings
702b460 Added Python tests for logging module bindings.  Added bindings for Formatter.h, StandardFormatter.h,  bindings for Formatter.h, StandardFormatter.h, StreamHandler.h, and LoggerFactory.h
8d52180 Win32 read now calculates bytesToRead with size_t
91089bf Win32 read now calculates bytesToRead with a size_t
31371c0 Merge pull request #8 from mdaus/math.linear_additions_up
53750f9 Fixing dot product error in angle function
fb3962c Resolved dot product error in angle function
de3b9bd false should be False
2257407 Rabble Rabble Rabble

git-subtree-dir: externals/coda-oss
git-subtree-split: be445dd68893aa159c9a9152a42ca42d432d62d1
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.

2 participants