Skip to content

Commit 9794d9e

Browse files
committed
support cuda in fix for numeric overflow
1 parent d84469d commit 9794d9e

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

urbansim/urbanchoice/mnl.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ def mnl_probs(data, beta, numalts):
3636
utilities.reshape(numalts, utilities.size() // numalts)
3737

3838
# https://stats.stackexchange.com/questions/304758/softmax-overflow
39-
if clamp:
40-
utilities.mat -= utilities.mat.max(0)
39+
utilities = utilities.subtract(utilities.max(0))
4140

4241
exponentiated_utility = utilities.exp(inplace=True)
4342
if clamp:

urbansim/urbanchoice/pmat.py

+6
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ def cumsum(self, axis):
7979
# elif self.typ == 'cuda':
8080
# return PMAT(misc.cumsum(self.mat,axis=axis))
8181

82+
def max(self, axis):
83+
if self.typ == 'numpy':
84+
return PMAT(np.max(self.mat, axis=axis))
85+
elif self.typ == 'cuda':
86+
return PMAT(self.mat.max(axis=axis))
87+
8288
def argmax(self, axis):
8389
if self.typ == 'numpy':
8490
return PMAT(np.argmax(self.mat, axis=axis))

0 commit comments

Comments
 (0)