Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
New patches.
- Loading branch information
Lassi Tuura
committed
Sep 14, 2011
1 parent
19b8cc6
commit 97436cb
Showing
2 changed files
with
126 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
diff --git a/src/utils/Signal.cpp b/src/utils/Signal.cpp | ||
index 7fcef14..72b226e 100644 | ||
--- a/src/utils/Signal.cpp | ||
+++ b/src/utils/Signal.cpp | ||
@@ -318,7 +318,7 @@ Signal::queue (pid_t process, int sig, int value /* = 0 */) | ||
process = 0; // silence unused warning | ||
sig = 0; // silence unused warning | ||
value = 0; // silence unused warning | ||
- return 0; | ||
+ return process + sig + (long long) value; | ||
#endif | ||
} | ||
|
||
@@ -335,7 +335,7 @@ Signal::queue (pid_t process, int sig, void *value) | ||
process = 0; // silence unused warning | ||
sig = 0; // silence unused warning | ||
value = 0; // silence unused warning | ||
- return 0; | ||
+ return process + sig + (long long) value; | ||
#endif | ||
} | ||
|
||
@@ -350,7 +350,7 @@ Signal::queue (int sig, int value /* = 0 */) | ||
#else | ||
sig = 0; // silence unused warning | ||
value = 0; // silence unused warning | ||
- return 0; | ||
+ return sig + (long long) value; | ||
#endif | ||
} | ||
|
||
@@ -365,7 +365,7 @@ Signal::queue (int sig, void *value) | ||
#else | ||
sig = 0; // silence unused warning | ||
value = 0; // silence unused warning | ||
- return 0; | ||
+ return sig + (long long)value; | ||
#endif | ||
} | ||
|
||
@@ -452,7 +452,7 @@ Signal::wait (const sigset_t *mask, | ||
mask = 0; // silence unused warning | ||
info = 0; // silence unused warning | ||
msecs = 0; // silence unused warning | ||
- return 0; | ||
+ return (long long) mask + (long long)info + msecs; | ||
#endif | ||
} | ||
|
||
diff --git a/classlib/iobase/DirIterator.h b/classlib/iobase/DirIterator.h | ||
index 623f1e1..9b52cb2 100644 | ||
--- a/classlib/iobase/DirIterator.h | ||
+++ b/classlib/iobase/DirIterator.h | ||
@@ -49,7 +49,7 @@ class Filename; | ||
|
||
The end indicator for the iteration range is the default | ||
constructed iterator. */ | ||
-class DirIterator : public std::iterator<std::input_iterator_tag, std::string, ptrdiff_t> | ||
+class DirIterator : public std::iterator<std::input_iterator_tag, std::string, std::ptrdiff_t> | ||
{ | ||
public: | ||
typedef std::input_iterator_tag iterator_category; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
--- a/numpy/distutils/system_info.py 2011-09-14 15:28:38.000000000 +0200 | ||
+++ b/numpy/distutils/system_info.py 2011-09-14 15:36:41.000000000 +0200 | ||
@@ -1283,23 +1283,13 @@ class lapack_opt_info(system_info): | ||
|
||
if sys.platform=='darwin' and not os.environ.get('ATLAS',None): | ||
args = [] | ||
- link_args = [] | ||
- if get_platform()[-4:] == 'i386': | ||
+ link_args = [os.environ["LAPACK"], os.environ["BLAS"]] | ||
+ if get_platform()[-6:] == 'x86_64': | ||
intel = 1 | ||
+ args.extend(['-msse3']) | ||
else: | ||
intel = 0 | ||
- if os.path.exists('/System/Library/Frameworks/Accelerate.framework/'): | ||
- if intel: | ||
- args.extend(['-msse3']) | ||
- else: | ||
- args.extend(['-faltivec']) | ||
- link_args.extend(['-Wl,-framework','-Wl,Accelerate']) | ||
- elif os.path.exists('/System/Library/Frameworks/vecLib.framework/'): | ||
- if intel: | ||
- args.extend(['-msse3']) | ||
- else: | ||
- args.extend(['-faltivec']) | ||
- link_args.extend(['-Wl,-framework','-Wl,vecLib']) | ||
+ args.extend(['-faltivec']) | ||
if args: | ||
self.set_info(extra_compile_args=args, | ||
extra_link_args=link_args, | ||
@@ -1369,28 +1359,14 @@ class blas_opt_info(system_info): | ||
def calc_info(self): | ||
|
||
if sys.platform=='darwin' and not os.environ.get('ATLAS',None): | ||
- args = [] | ||
- link_args = [] | ||
- if get_platform()[-4:] == 'i386': | ||
+ args = ['-I' + os.environ.get("LAPACK_ROOT", ".")] | ||
+ link_args = [os.environ["BLAS"]] | ||
+ if get_platform()[-6:] == 'x86_64': | ||
intel = 1 | ||
+ args.extend(['-msse3']) | ||
else: | ||
intel = 0 | ||
- if os.path.exists('/System/Library/Frameworks/Accelerate.framework/'): | ||
- if intel: | ||
- args.extend(['-msse3']) | ||
- else: | ||
- args.extend(['-faltivec']) | ||
- args.extend([ | ||
- '-I/System/Library/Frameworks/vecLib.framework/Headers']) | ||
- link_args.extend(['-Wl,-framework','-Wl,Accelerate']) | ||
- elif os.path.exists('/System/Library/Frameworks/vecLib.framework/'): | ||
- if intel: | ||
- args.extend(['-msse3']) | ||
- else: | ||
- args.extend(['-faltivec']) | ||
- args.extend([ | ||
- '-I/System/Library/Frameworks/vecLib.framework/Headers']) | ||
- link_args.extend(['-Wl,-framework','-Wl,vecLib']) | ||
+ args.extend(['-faltivec']) | ||
if args: | ||
self.set_info(extra_compile_args=args, | ||
extra_link_args=link_args, |